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]
