Tou Nou Thao wrote:
>
> I did an updated on the main trunk and merged it with the branch. The
> command was: cvs update -j <branch name> <main trunk>
If I read that right, you simply forced the branch into the trunk, and
didn't do a merge.
cvs update -j branch1 -j branch2
Calculate the diff between branch1 and branch2 and apply it to the sandbox.
This is useful to convert an entire branch to another branch - I often use
it to make a transitional branch the new trunk.
cvs update -j branch1
Merge branch1 into the sandbox.
If you have something branched for too long the number of conflicts becomes
unmanageable. The merge is done from the original branchpoint to the
present, so it becomes more difficult over time. I try to avoid branching
for more than a week or two.
Tony
------------------------ Yahoo! Groups Sponsor ---------------------~-->
Get 128 Bit SSL Encryption!
http://us.click.yahoo.com/CBxunD/vN2EAA/xGHJAA/z3wwlB/TM
---------------------------------------------------------------------~->
To unsubscribe from this group, send an email to:
cvsgui-unsubscribe@xxxxxxxxxxx
Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/
|
