02.05.2013 Views

User Guide - Mks.com

User Guide - Mks.com

User Guide - Mks.com

SHOW MORE
SHOW LESS

You also want an ePaper? Increase the reach of your titles

YUMPU automatically turns print PDFs into web optimized ePapers that Google loves.

Chapter 6: Member Operations<br />

Checking In a<br />

Member<br />

186<br />

When you are satisfied with the changes you have made to a member, you<br />

should check in the member to preserve those changes as a new revision in<br />

the member’s history. Members should be checked in on a regular basis.<br />

checking in a member creates a new revision of a member and adds it to the<br />

member history. When a member is checked in to a revision other than the<br />

head revision or a branch tip revision, a new branch is created.<br />

The author name is the name you associate with revisions upon check in. By<br />

default, your author name is your user name.<br />

In the Source Integrity Web interface, because sandboxes do not exist, a<br />

source file (working file) for the member is specified and checked in as the<br />

new revision.<br />

Starting a Branch When Checking In a Member<br />

Source Integrity usually places a new revision at the top of the trunk,<br />

assigning it a two-part revision number, such as 1.15. There are times,<br />

however, when you do not want your work to be checked into the trunk.<br />

You may be pursuing a line of development that will not be included in the<br />

finished product, or you may be doing post-release maintenance while<br />

development for the next release continues on the trunk. For information<br />

on branching, see “Branching and Merging Revisions” on page 337.<br />

Divergent lines of development in the same archive are managed through<br />

the use of branches. A branch is an independent revision line that uses an<br />

existing revision as its starting point. Members of a branch revision are<br />

identified by their revision numbers. Whereas revisions on the trunk are<br />

characterized by two-part revision numbers (for example, 1.2 or 3.5),<br />

branch revision numbers are prefixed with the number of the revision they<br />

start from. For example, if a branch revision is started from revision<br />

number 1.2, the members of that branch are numbered<br />

1.2.1.3<br />

1.2.1.2<br />

1.2.1.1<br />

and so on. The first two digits of the number identify the revision where<br />

the branch diverges from the trunk, and the last two represent a position<br />

on the branch.<br />

Assigning Revision Numbers<br />

By default, when you check in a member, Source Integrity automatically<br />

assigns a unique revision number to the new revision. It does this by<br />

incrementing the current revision number by one. For example, if the<br />

previous revision is 1.3, the new revision is assigned number 1.4.<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!