User XXX Pre-merges
the Labelled Baseline EX002_001
to His Branch xxx_R94

First, we make sure all work is checked in.

xxx% cleartool ci -nc `cleartool lsco -cview -all -s`
Checked in "/tmp/sjk_demo/src/main.C" version "/main/xxx_R94/2".

We are ready to pre-merge from the main development branch (usually /main). We have previously updated our config spec to use the Buildmeister's latest config spec recommendation, to define the files we are interested in.

xxx% ct catcs
element * CHECKEDOUT
element	*	PKGS_90	-nocheckout
element *	.../xxx_R94/LATEST
mkbranch xxx_R94
element	*	EX002_001
element	*	/main/0

We need to run the findmerge in dry-run mode--simply printing the results to the screen instead of executing them--to make sure we have correctly set our config spec and are getting the files we intend:

xxx% 
xxx% ct findmerge -all -fver EX002_001 -print
Needs Merge "/tmp/sjk_demo/src/main.C" [to /main/xxx_R94/2 from /main/4 base /main/3]
Log has been written to "findmerge.log.26-Jan-99.11:13:21".
xxx% cat findmerge.log.26-Jan-99.11:13:21
cleartool findmerge /tmp/sjk_demo/src/main.C -fver /main/4 -log /dev/null -merge -cqe

If you get unexpected files included in the merge, call your product's Buildmeister for assistance before proceeding. But the results of our dry-run look good. Let's proceed with the "real" merge:

xxx% ct findmerge -all -fver EX002_001 -xmerge -qall
Needs Merge "/tmp/sjk_demo/src/main.C" [to /main/xxx_R94/2 from /main/4 base /main/3]
Checkout comments for this and any additional elements:
Pre-merger from the EX002_001 baseline.
.
Checked out "/tmp/sjk_demo/src/main.C" from version "/main/xxx_R94/2".
Saving to /tmp/sjk_demo/src/main.C.merge
Moved contributor "/tmp/sjk_demo/src/main.C" to "/tmp/sjk_demo/src/main.C.contrib.1".
Output of merge is in "/tmp/sjk_demo/src/main.C".
Recorded merge of "/tmp/sjk_demo/src/main.C".
Log has been written to "findmerge.log.19-Jan-99.16:54:32".

And now let's return to our main sequence of events to see the conclusion of our efforts.