Mike Castle wrote:
> So, for your situation, yuou have something like this:
>
> Branch point
> v
> 0----+-------- Main
> |
> +------- Test
>
> Now, hopefully you labled the branch point
> with something when you created
> the branch. Otherwise, this is a pain.
(Allow me to advertise my patch again)
My patch will alleviate some of this pain,
(though my patch may imply some changes that
need to be made to wincvs or other cvs clients
besides the command line cvs client, specifically
in the area of allowing "cvs add" to work with the
".trunk" tag.)
http://www.geocities.com/dotslashstar/branch_patch.html
Then you could merge from trunk to branch "foo" like this,
using the ".trunk" and "branchname.origin" pseudo tags
that the patch implements.
cvs rtag -r .trunk trunk_merge_point modulename
cvs co -r foo modulename
cd modulename
cvs update -j foo.origin -j trunk_merge_point
cvs commit
cvs tag foo_post_trunk_merge
-- steve
__________________________________________________
Do You Yahoo!?
Send instant messages & get email alerts with Yahoo! Messenger.
http://im.yahoo.com/
