Christopher Fouts wrote: > This is done in userA's directory structure, which is based on > branchA correct? So no userA's files now have userB's changes > right? And now for the trunk to get userA's changes as well I > do a ... > > > cvs co proj > > cvs up -j branchA > > Correct? The first time, yes. If userA will continue to work on the branch, then userA needs to immediately apply a tag to the branch: cvs tag -r branchA branchA_last_merge_from_branch
Then the next time userA merges, the commands will be: cvs co proj cvs up -j branchA_last_merge_from_branch -j branchA cvs tag -F -r branchA branchA_last_merge_from_branch A couple of "By the way"s: BTW1: The person doing the merge can use 'cvs update -A' instead of 'cvs co proj'. Either will work. BTW2: The person doing the merge does does not necessarily have to be userA, although userA would be best suited to figure out any conflicts that may arise. -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. ( http://www.leitch.com ) Columnist, C/C++ Users Journal ( http://www.cuj.com/experts ) _______________________________________________ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs