I've got some difficulty in understanding how to tag dead revisions such that branch merges will work.
Consider this: Initial state (version, tag): 1.3 LAST_MERGED 1.4 REL_1 Now merge on some branch: cd branch... cvs up -j LAST_MERGED -j REL_1 cvs rtag -F -r REL_1 LAST_MERGED I get on trunk: 1.3 1.4 REL_1, LAST_MERGED Ok. Now delete the file, commit: cvs rm -f file cvs ci 1.3 1.4 REL_1, LAST_MERGED 1.5 dead How would I have to create tag REL_2 so that a following cvs up -j LAST_MERGED -j REL_2 will delete the file on the branch as well? Obviously, the tags need to be something like 1.3 1.4 REL_1, LAST_MERGED 1.5 REL_2, dead but how to get REL_2 onto the dead rev? cvs tag ... in the sandbox won't find the file anymore. Thanks, Michael _______________________________________________ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs
