[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Easiest way to move a branch to the trunk

From: Brian J. Murrell
Subject: Easiest way to move a branch to the trunk
Date: Fri, 2 Feb 2001 05:07:31 -0800
User-agent: Mutt/1.2.5i

I have a project/repository which has a main branch (trunk) for
stable, released versions and a development branch.  The development
branch was branched off of the main branch a while ago for development
and has going along gangbusters.  Now it is time to release.  What is
the easiest way to move the develoment branch onto the main branch so
that what is on the main branch is completely replaced by the
development branch.

I realize of course I could use "cvs update -j" to move it all over
but that is going to create a boatload of conflicts.  I can deal with
conflicts easily (and tediously) enough but I wonder why I should need
to bother.  It seems that I should be able to simply replace the
contents of the main branch with the development branch in an easier
way, no?

All suggestions welcome, thanx.


Brian J. Murrell

reply via email to

[Prev in Thread] Current Thread [Next in Thread]