[Google SOC] Rebase command

Stefano stefano at inventati.org
Wed Mar 26 06:31:38 CDT 2008


Peter Arrenbrecht wrote:
> Basically yes, but:
>
> 1. It gets more interesting if both A and B work on the same file (a
> suitable line distance apart) so three-way-merge will be needed.
>
> 2. The "transplant" case is more interesting, too, where A wants to
> cherry-pick change Y from B's repo where B has new unpushed changes X,
> Y, Z.
>   
Would you mind checking if I've understood the problems?
case 1 => test_rebase_2
case 2 => test_rebase_transplant

Thank you
Stefano
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: test_rebase_2
Url: http://selenic.com/pipermail/mercurial-devel/attachments/20080326/dade2622/attachment.txt 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: test_rebase_transplant
Url: http://selenic.com/pipermail/mercurial-devel/attachments/20080326/dade2622/attachment-0001.txt 


More information about the Mercurial-devel mailing list