Re: How do I move a branch back to the main trunk without merging ?

[Cameron, Steve]

Logan Wilkins wrote:

> I need some help with a simple problem. I'd like to move a branch 
> back to the main trunk, but I don't want to merge the revisions; I 
> want to overwrite what's in the main trunk with what's in the branch. 
> Does anyone know of a way to do that.   Thanks in advance, 

So you have something like this...(this involves merging,
but I think it does what you want).


       /-----------BranchX
      /
-----A-------------(trunk)

Where "A" is the tag denoting the point at which
the branch forked off from the trunk.


cvs rtag -r BranchX BranchX_to_trunk_10_10_2000 everything
cvs rtag trunk_pre_branchX_merge everything

cvs co everything
cd everything
cvs update -d -P -j trunk_pre_branchX_merge -j A

(rolls back the trunk to point A)

cvs commit
cvs rtag trunk_rolled_back_to_point_A everything
cvs update -d -P -j A -j BranchX_to_trunk_10_10_2000

(the trunk should be in a state just like "A", so these
changes should just go in nicely)

cvs commit

(This is off the top of my head, so you may try it, but
no guarantees.)

hope it's some help

-- steve