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.
Alan Thompson
"Harvey J. Stein" <[EMAIL PROTECTED]> on 2000/04/11 09:28:49 AM
To: [EMAIL PROTECTED]
cc: (bcc: Alan Thompson/Orincon)
Subject: Long term branch development - merges become problematic.
I have a major change I want to make in my source tree, but I don't
want to interfere with normal system development, so I created a
branch called new-feature, by doing:
cvs tag -b new-feature
in a working directory.
Now, I want to merge in changes that have occurred on the main
branch, so I can do something like:
cvs update -j HEAD
for example, in the same working directory
The question is, what do I do the next time?
It looks to me like I need in general to tag the main branch before
each merge so that I have a reference point for future merges on the
branch. Is this the case? It seems kind of ugly... Are there any
cleaner alternatives?
Thanks,
--
Harvey Stein
Bloomberg LP
[EMAIL PROTECTED]
