On Thu, 07 Sep 2000, Benjamin Balagot wrote:
> Hello,
>
> I'm new to CVS and would like to find some answers.
>
> We have a BRANCH e.g. branch1 that was branched off
> the main line
> and another branch e.g. branch2 that I recently
> branched off the main line.
>
> How can I merge the 2 branches so that all additional
> files in branch1 will show
> up in branch2?
>
> Thanks!
>
When you created your branches, did you create a regular
non branch tag on the trunk first?
Assuming yes, and that the tag marking the origin of
branch1 is branch1origin, then:
cvs rtag -r branch1 merged_to_branch2_01 everything
cd someplace
cvs co -r branch2 everything
cvs tag prior_to_branch1_merge
cvs update -d -P -j branch1origin -j merged_to_branch2_01
(resolve any conflicts)
cvs commit
The first "rtag" is so that if you have to merge branch1
into branch2 _again_, you won't have to remerge tha same
changes in again, (doing that can be painful).
The second tag is so that if the merge doesn't go well but
you don't notice it until after the commit, you have a way
to undo the merge.
If you didn't tag the trunk prior to making your branches,
you might be interested in a CVS patch I have made at
http://www.geocities.com/dotslashstar/branch_patch.html
-- steve
__________________________________________________
Do You Yahoo!?
Yahoo! Mail - Free email you can access from anywhere!
http://mail.yahoo.com/
