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

[Tony Hoyle]

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