The Buildmeister
merges xxx_R94
First, the Buildmeister adjusts his view so that the "high-water mark" basis of the versions he sees in /main/LATEST. All merges will be to /main/LATEST:
Builder% ct catcs
element * CHECKEDOUT
element * PKGS_90 -nocheckout
element * /tmp/sjk_demo/... /main/LATEST
Builder% ct findmerge -all -fver .../xxx_R94/LATEST -c "Merge branch xxx_R94" -merge -xmerge
Needs Merge "/tmp/sjk_demo/src/Makefile" [(automatic) to /main/1 from /main/xxx_R94/2 (base also /main/1)]
Checked out "/tmp/sjk_demo/src/Makefile" from version "/main/1".
Trivial merge: "/tmp/sjk_demo/src/Makefile" is same as base "/tmp/sjk_demo/src/Makefile@@/main/1".
Copying "/tmp/sjk_demo/src/Makefile@@/main/xxx_R94/2" to output file.
Moved contributor "/tmp/sjk_demo/src/Makefile" to "/tmp/sjk_demo/src/Makefile.contrib".
Output of merge is in "/tmp/sjk_demo/src/Makefile".
Recorded merge of "/tmp/sjk_demo/src/Makefile".
Needs Merge "/tmp/sjk_demo/src/main.C" [to /main/4 from /main/xxx_R94/1 base /main/3]
Checked out "/tmp/sjk_demo/src/main.C" from version "/main/4".
********************************
<<< file 1: /tmp/sjk_demo/src/main.C@@/main/3
>>> file 2: /tmp/sjk_demo/src/main.C@@/main/xxx_R94/1
>>> file 3: /tmp/sjk_demo/src/main.C
********************************
-----------[after 8 file 1]------------|----------[inserted 9 file 2]----------
-| num_slices = num_slices - 1;+
|-
-----------[after 8 file 1]------------|----------[inserted 9 file 3]----------
-| --num_slices; // We want mor+
|-
*** No Automatic Decision Possible
merge: Warning: *** Aborting...
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".
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.15:30:39".
Since there was a conflict, the Buildmeister throws out the branch.
Builder% ct unco -rm `ct lsco -cview -all -s` Checkout cancelled for "/tmp/sjk_demo/src/Makefile". Checkout cancelled for "/tmp/sjk_demo/src/main.C".