The Buildmeister
merges yyy_R95
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 .../yyy_R95/LATEST -c "Merge branch yyy_R95" -merge -xmerge
Needs Merge "/tmp/sjk_demo/src/main.C" [to /main/4 from /main/yyy_R95/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/yyy_R95/1
>>> file 3: /tmp/sjk_demo/src/main.C
********************************
-----------[after 8 file 1]------------|----------[inserted 9 file 3]----------
-| --num_slices; // We want mor+
|-
*** Automatic: Applying INSERT from file 3 [line 9]
============
============
----------[after 12 file 1]------------|----------[inserted 13 file 2]---------
-| --num_slices; // Yummm....
|-
*** Automatic: Applying INSERT from file 2 [line 13]
============
============
----------[after 20 file 1]------------|--------[inserted 22-24 file 3]--------
-|
|
|
|-
*** Automatic: Applying INSERT from file 3 [lines 22-24]
============
============
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.15:39:03".
Builder%
The merge is complete. Now the Buildmeister builds the product.
Builder% clearmake Cannot reuse "main.o" - version mismatch for "main.C" ======== Rebuilding "main.o" ======== CC -c -I. -I../pkgs/corp/include main.C Will store derived object "/tmp/sjk_demo/src/main.o" ======================================================== Must rebuild "example" - due to rebuild of subtarget "main.o" ======== Rebuilding "example" ======== CC -o example main.o Will store derived object "/tmp/sjk_demo/src/example" ========================================================
And now, the Buildmeister is
ready to examine what he has built...