Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
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 after the initial branching. (Sorry, I didn't realize this at first). If this cannot be done, what would be the best way to make the branch the HEAD, losing history? -----Original Message----- From: Tony Hoyle [mailto:tmh at nodomain.org] Sent: Wednesday, September 01, 2004 2:14 AM To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: [cvsnt] Re: Merging a repository from Branch to Trunk Herb Croken wrote: > Hi all, > To make a short story long, for legal reasons we branched our entire > repository (a year ago, so lots of changes) and have been developing in that > branch ever since. Now we want to merge the entire branch to the trunk of a > new repository (on a new server as well), without having to resolve > conflicts, differences etc. Any hints on the best\easiest way to do this? > > I realize that we will be losing all history in this process, and will be > going to v1.1 for all files. We will create a second repository on the new > server also, which will be a snapshot of the current repository (the branch) > prior to the move. > Use two -j options: cvs update -A cvs update -j branch -j HEAD This will merge all the differences between the branch and HEAD, avoiding conflicts. There's no need to lose history this way. If you really want to start a new repository do an export followed by import on the new server. Tony _______________________________________________ cvsnt mailing list cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs