02.05.2013 Views

User Guide - Mks.com

User Guide - Mks.com

User Guide - Mks.com

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

Working With Sandboxes<br />

Preventing Conflicts With Other Development Paths<br />

Development paths can conflict when developers working on different<br />

paths need to work on the same revision of a file. There is also the potential<br />

for conflict when development paths access the same member histories.<br />

For example, the current version of a project includes utility.dll,<br />

version 1.4 and the variant sandbox contains utility.dll, version 1.3.<br />

Both versions are stored in the same member history.<br />

Other potential conflicts include:<br />

a developer with a variant sandbox locks revisions needed by<br />

developers working in regular sandboxes<br />

work on one development path locks out those working on a different<br />

development path<br />

To prevent potential conflicts, Source Integrity assumes that locking a<br />

revision is appropriate when you check out a revision when working in a<br />

variant sandbox. You are further prompted to branch the member history<br />

when you check out a revision with a potential conflict, for example:<br />

The project Apex.pj, version 1.2 was checkpointed at version 1.2 and<br />

included utility.dll version 1.2 and library.lib version 1.3.<br />

A development path is created for Apex.pj, version 1.2.1.1 and<br />

includes the same file versions for utility.dll (version 1.2) and<br />

library.lib (version 1.3).<br />

Branching the member history gives each development path its own copy<br />

of the revision.<br />

Creating a Development Path<br />

A variant sandbox uses a project checkpoint as the starting point for new<br />

development. In Source Integrity, you define a new development path for<br />

the variant sandbox.<br />

The development path:<br />

identifies a new direction of development<br />

includes a new revision history<br />

keeps changes separate from the main development path or trunk<br />

You must first create and name the development path, and then create the<br />

variant sandbox.<br />

147

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!