To prepare to merge
Procedure
- The project manager makes sure that no element is checked out on
the major branch.
% cleartool lscheckout -all /vobs/monet /vobs/libpub
Tip: Any MAJ team members who want to continue with nonmerge work can create a subbranch at the "frozen" version (or work with a version that is checked out as unreserved). - The project manager performs any required directory merges.
% cleartool setview major_vu% cleartool findmerge /vobs/monet /vobs/libpub –type d \ –fversion /main/LATEST –mergeNeeds merge /vobs/monet/src [automatic to /main/major/3 from /main/LATEST] . . . Log has been written to "findmerge.log.04-Feb-04.09:58:25".
Any MAJ team view can be used.
The output log describes the findmerge actions.
- After checking in the files, the project manager determines which
elements need to be merged.
The output log describes the findmerge actions. This last findmerge log file is in the form of a shell script: it contains a series of cleartool findmerge commands, each of which performs the required merge for one element.% cleartool findmerge /vobs/monet /vobs/ibpub -fversion /main/LATEST –print . . . A 'findmerge' log has been written to "findmerge.log.04-Feb-04.10:01:23"
% cat findmerge.log.04-Feb-04.10:01:23cleartool findmerge /vobs/monet/src/opt.c@@/main/major/1 -fver /main/LATEST –merge cleartool findmerge /vobs/monet/src/prs.c@@/main/major/3 -fver /main/LATEST –merge . . cleartool findmerge /vobs/libpub/src/dcanon.c@@/main/major/3 -fver /main/LATEST -merge cleartool findmerge /vobs/libpub/src/getcwd.c@@/main/major/2 -fver /main/LATEST -merge cleartool findmerge /vobs/libpub/src/lineseq.c@@/main/major/10 -fver /main/LATEST -merge
- The project manager locks the major branch, allowing it
to be used only by the developers who are performing the merges.
cleartool lock –nusers meister,arb,david,sakai brtype:major@/vobs/monet \ brtype:major@/vobs/libpubLocked branch type "major". Locked branch type "major".
Parent topic: Merging ongoing development work