Re: Merging from main to branch.

[Larry Jones]

Carter Thompson writes:
> 
> Using tags would be much easier, however I'm just not getting
> what I need when playing around in my own sandbox.  If I tag
> the directory "install" in the main line "merge-from" and I 
> tag the branch "merge-to" shouldn't I be able to do something 
> like this:
> 
> cvs co -r project-branch module
> cvs update -j merge-from -j merge-to 

Yes and no.  The above commands are correct -- although there's no need
to do them separately, you can combine them:

        cvs co -r project-branch -j merge-from -j merge-to module

The problem is that you're tagging the wrong things.  "merge-from"
should be the revision (on the trunk) just before the changes you want
to merge and "merge-to" should be the revision (also on the trunk) the
contains all of the changes to be merged.

-Larry Jones

I don't need to do a better job.  I need better P.R. on the job I DO.
-- Calvin