info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Tag/branch question


From: Lemke, Michael IZ/HZA-IOM
Subject: Tag/branch question
Date: Wed, 15 Jun 2005 16:07:12 +0200

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]