The only thing my method shouldn't account for is files removed from the branch
and not the trunk. You should be able to use a diff to get those if you need to.
Try Steve's method first if you have the A tag or can get it into place.
Derek
--
Derek Price CVS Solutions Architect ( http://CVSHome.org )
mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com )
--
Welcome to the Church of the Holy Cabbage. Lettuce pray
"Derek R. Price" wrote:
> Steve's method should work if you have the A tag in place. Assuming
> BranchX in dir "branchx" and the trunk in dir "trunk", you could also try:
>
> cd branchx
> find . -name CVS -prune -o -type f -exec cp {} ../trunk/{} \;
> cd ../trunk
> cvs commit
>
> Derek
>
> --
> Derek Price CVS Solutions Architect ( http://CVSHome.org )
> mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com )
> --
> ******* **** **** *******
> * * * * * * * * *
> * * * * * * * * * * *
> * * * * * * * *
> * *** * * * * *
> * * * * * * * * * * *
> * * * * * * * * ***** *
> ** * ** * * * *
> ******* * *******
>
> "Cameron, Steve" wrote:
>
> > 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
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
