[cvsnt] Re: Merging a repository from Branch to Trunk

[Herb Croken]

Ok, maybe I am doing something wrong. 
Here is what I tried:
 cvs upd -A -C
 cvs -j'branchname' -jHEAD
Nothing happened, so I did
 cvs upd -jHEAD -j'branchname' 
Lots happened :) but 
 cvs ci -m "message" failed with loads of conflicts

'filename' had a conflict and has not been modified
cvs [server aborted]: correct above errors first!

-----Original Message-----
From: Tony Hoyle [mailto:tmh at nodomain.org]
Sent: Tuesday, September 07, 2004 11:21 AM
To: cvsnt at cvsnt.org
Subject: Re: [cvsnt] Re: Merging a repository from Branch to Trunk


Herb Croken wrote:
> Thanks, that solution works for modules where there was no development in
> the HEAD, subsequent to the initial branching. In most of our core modules
> it looks like we were developing in the HEAD (for one scenario), as well
as
> developing separately in the branch (for a second scenario).  Our dev mgr
> says it would be way to much work to resolve all conflicts. So, I quess
the
> question now is, is it possible to make the branch the HEAD and retain
> history? We do not need to keep the development that was done in the HEAD

The commands I posted before will do exactly that, independently of any 
development on HEAD.

Tony

_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt