Re: Merge question

[Larry Jones]

address@hidden writes:
> 
> When merging 2 branches, say HEAD to branchB, where
> branchB contains files NOT YET in HEAD, the branchA
> files get "deleted." Any way to prevent this?
> 
>       > cvs up <options???> -j branchA -j HEAD proj
> 
> IOW, what options do I need?

The ones you have, but you have to use the correct revisions with the -j
options.  The command above says to take all the changes between the tip
of branchA and the tip of the trunk and apply them to the current files,
which are presumably the tip of branchA.  This will undo *all* of the
changes on branchA, not just the new files.  What you probably want to
do is take the changes from the *base* of branchA to the tip of the
trunk and apply them.  If you didn't create a revision tag for the
branch point when you created the branch, you'll have to do so now.

-Larry Jones

These things just seem to happen. -- Calvin