Re: Merging Between Branches

[Larry Jones]

Jake Colman writes:
> 
> I have two development branches used to implement two variants of our core
> software.  BRANCH_A contains many new features. BRANCH_B is a version of
> source code upgraded to use new versions of the compiler and several
> third-party libraries.  Neither project is yet ready to be merged to the HEAD
> (trunk), yet the project in BRANCH_A wants the changes made in BRANCH_B.  How
> do I do this merge, both initially and as we make additional progress in both
> branches?

The same way you do merges to the trunk -- you use update with two -j
options in a working directory, you just use a working directory that's
checked out on the branch you want to merge to rather than one that's
checked out on the trunk.  You'll probably want to use a unique set of
tags to keep track of what you've merged to the branch vs. what (if
anything) you've merged to the trunk.  See the branching and merging
section of the manual for more details:

        <http://www.cvshome.org/docs/manual/cvs_5.html#SEC54>

-Larry Jones

Something COULD happen today.  And if anything DOES,
by golly, I'm going to be ready for it! -- Calvin