Branch or New Repo?

Greg Ward greg-hg at gerg.ca
Thu Jun 25 08:39:30 CDT 2009


On Wed, Jun 24, 2009 at 2:26 PM, Stephen Rasku<mercurial at srasku.net> wrote:
> We are rebooting a release.  We want to restart our development from
> the last release and then merge all the bug fixes that we have made
> onto the new branch or repository.  We will be omitting a couple major
> features but we will be merging all the bug-fixes over.  What is the
> best way to do this?  Create a branch in the current repo or create a
> separate repo?  Does it matter? What is the best way to merge the
> individual fixes?

IMHO branches have a couple of advantages here:

* you can use 'transplant' to cherrypick your bug fixes over; with
separate repos, you would have to "export | import", probably between
two working copies

* developers can have a single working copy and just "update" across
branches in it, rather than needing multiple working copies

* the branch name is burned into every changeset, so it's easy to tell
from 'hg log' which bugs have been cherrypicked to the new branch

Greg



More information about the Mercurial mailing list