02.05.2013 Views

Description - Mks.com

Description - Mks.com

Description - 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.

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

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

to a revision other than the head revision. The most recent revision of a branch is called the<br />

tip revision.<br />

MKS Source Integrity usually places new revisions at the top of the trunk, assigning them<br />

two-part revision numbers, such as 1.15. There are times, however, when you do not want<br />

your work to be checked into the trunk. You may be pursuing a line of development that will<br />

not be included in the finished product, for instance, or you may be doing post-release<br />

maintenance while development for the next release continues on the trunk.<br />

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

branches. A branch is an independent revision line that uses an existing revision as its<br />

starting point. Members of a branch revision are identified by their revision numbers.<br />

Whereas revisions on the trunk are characterized by two-part revision numbers (for<br />

example, 1.2 or 3.5), branch revision numbers are prefixed with the number of the revision<br />

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

members of that branch are numbered<br />

1.2.1.1<br />

1.2.1.2<br />

1.2.1.3<br />

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

the trunk, and the last two represent a position on the branch.<br />

--[no|confirm]branchUpdate<br />

controls whether to update the member revision, even if it is on a branch. This option stops<br />

the member revision from accidentally moving onto a branch if a branch was created during<br />

check out. This option only applies if --update is specified, --revision was not<br />

specified, and the member revision is on a different branch from the working revision.<br />

--nobranchUpdate means do not update the member revision.<br />

--confirmbranchUpdate means ask before updating the member revision.<br />

--branchUpdate always updates the member revision.<br />

--cpid=ID<br />

--changePackageId=ID<br />

identifies a change package that is notified of this action, for example, 1452. Note the<br />

following about using this option:<br />

61 of 457

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

Saved successfully!

Ooh no, something went wrong!