FYI: transplanting changsets (aka. rebase)

[Christian Thalinger]

Hi!

The last email flood (yesterday) was my second transplanting of the
changesets from the default branch to the cacao branch.  I'll do this
from time to time to keep the cacao branch up to date for later merging
back to the default branch (if that will ever happen).

transplant is a Mercurial extension that is enabled by default.  As for
other commands

$ hg help transplant

gives you a help screen.

Here's a quick overview of how I transplant the changesets:

- Switch to the cacao branch.  You can check this with:

$ hg branch
cacao

- Transplant all changesets from the default branch to the cacao branch
(this is also called rebase):

$ hg transplant --branch default --all

As the help states:

    hg transplant --branch REVISION --all will rebase the selected branch
    (up to the named revision) onto your current working directory.

Most likely a transplant will give you some merge conflicts, but
Mercurial will tell you what to do (hint: hg transplant --continue).

Maybe Mark can stop the email flooding...

- twisti