[Google SOC] Rebase command

Brendan Cully brendan at kublai.com
Thu Mar 27 13:29:09 CDT 2008

On Wednesday, 26 March 2008 at 13:57, Patrick Mézard wrote:
> Peter Arrenbrecht a écrit :
> > On Wed, Mar 26, 2008 at 12:31 PM, Stefano <stefano at inventati.org> wrote:
> >> Peter Arrenbrecht wrote:
> >>
> >>  echo -e "\n-- User a wants to cherry-pick just the Y-feature"
> >>  # Something like:
> >>  # cd $BASEDIR/user_a
> >>  # hg rebase user_b -r 2
> > 
> > This would probably be "hg transplant" rather than rebase, but with
> > transplant augmented to do proper three-way merge. This is part of
> > what your work would encompass.
> I would not focus too much about cherry-picking in the beginning, a
> working branch rebasing command looks like a good first milestone to
> me.

Actually transplant is basically a UI for rebasing, including resuming
after errors, avoiding duplicate commits, and finding branch roots. If
I were going to tackle this, I think I would try to teach transplant
how to do 3-way merge. I think the merge strategy described at the
bottom of the transplant extension wiki page would also be interesting
to consider.

More information about the Mercurial-devel mailing list