[EMAIL PROTECTED] writes:

 > You are correct.  This is described in the Cederqvist manual in the section
 > titled "Merging from a Branch Several Times".  You need to tag the trunk at the
 > location of each merge, so that on the next merge you can say the equivalent of
 > "merge in only changes since the last merge".  Be sure to document your tags and
 > their meaning carefully, so that you will be able to use them in the future and
 > not forget their names or meanings.

Contrast that to how simple things are if I don't want to commit my
changes to the repository.  Then I can just do cvs update whenever I
want to merge changes onto my branch & CVS keeps track of which
versions to use.  It's too bad that CVS can't keep track of last merge
info for future merges.  Is such a thing on the to-do list?

-- 
Harvey Stein
Bloomberg LP
[EMAIL PROTECTED]

Reply via email to