[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging from main to branch.
From: |
Larry Jones |
Subject: |
Re: Merging from main to branch. |
Date: |
Wed, 21 Apr 2004 20:04:44 -0400 (EDT) |
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