[Google SOC] Rebase command

[Patrick Mézard]

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.