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

Tony Hoyle tmh at nodomain.org
Tue Sep 7 19:21:19 BST 2004

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.

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.


More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook