Re: Making a branch the trunk

[Kaz Kylheku]

On Fri, 5 Apr 2002, Matt Herscovitch wrote:

> Date: Fri, 05 Apr 2002 17:24:17 +1000
> From: Matt Herscovitch <address@hidden>
> To: address@hidden
> Subject: [info-cvs] Making a branch the trunk
> 
> We have got ourselves into a situation where a branch has become the main 
> line of development and the trunk is no longer in use. In order to simplify 
> our branching scheme I was wondering: is there is any way of easily 
> transferring what is on a branch to the trunk?

In this type of situation, there is often some ``stub'' of development
on the trunk between the branchpoint and the tip of the trunk, work
that everyone has forgotten about.  Someone needs to investigate what
those differences are. If they are not worthwhile, then you can merge a
reverse delta of all those changes onto the tip of the trunk, effectively
backing them out. That is done using cvs up -j HEAD -j <branchpoint_tag>
followed by a commit.  Your trunk tip then looks like the branchpoint,
so you can merge the branch to the trunk without conflicts.  Otherwise,
just do a straight merge and resolve conflicts.  That is usually how
material is transferred from a branch to trunk.

-- 
Meta-CVS: solid version control tool with directory structure versioning. 
http://users.footprints.net/~kaz/mcvs.html