Hello, all
There's been a few discussions here where I work about
branches and merging. The Cederquist manual states
that:
"If you just use the cvs update -j R1fix m.c command
again, CVS will attempt to merge again the changes
which you have already merged, which can have
undesirable side effects." [1]
We've been tagging all the merging we've done between
our main development branch (MAIN) and a branch for
bug fixing (Patch) on every merge, and have used the
suggested method of using two -j options when
merging.[2]
My question is: Is this really necesary? If I want to
merge the head of the patch branch with the head of
the main branch, is it not exough to do "update -r
Patch ."?
Regards
Kyrre
=====
------------------------------------------------------------
Kyrre Kristiansen
___________________________________________________________ALL-NEW Yahoo! Messenger -
all new features - even more fun! http://uk.messenger.yahoo.com
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs
