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.

Chapter 10: Branching and Merging Revisions<br />

Branching Revisions<br />

338<br />

A branch is a revision path that diverges from the main line of development<br />

(or trunk) in a member or project history. A branch is typically created by<br />

checking in a file to a revision other than the head revision. The most<br />

recent revision of a branch in a history is called the tip revision. When you<br />

branch a member the working revision number is appended to indicate the<br />

branch. For example, the member features.txt at revision 1.2 is<br />

branched and appears with the working revision number 1.2.1.1.<br />

The branching on check out option allows multiple users to share locks on<br />

the same revision by creating new branches automatically. You can use this<br />

option to check out a file that is locked by another user. When you apply<br />

the branching on check out option, Source Integrity provides you with a<br />

locked working revision on new branch where you can proceed with<br />

development.<br />

You can merge revisions when development is <strong>com</strong>plete, or check in your<br />

revisions to the new branch without merging. For more details on checking<br />

in and merging, see “Merging on Check In” on page 343.<br />

To branch a member upon check out in the graphical user interface<br />

and Web interface<br />

1 With a Project or Sandbox view open, select one or more locked<br />

members to check out.<br />

2 Do one of the following:<br />

Select Member > Check Out.<br />

Click .<br />

The Check Out dialog box is displayed.<br />

u s e r g u i d e

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

Saved successfully!

Ooh no, something went wrong!