[PATCH 2 of 2 stable] rebase: handle rebasing of merges of destination ancestors

[Pierre-Yves David]

On 11/08/2014 11:30 AM, Mads Kiilerich wrote:
> On 11/08/2014 11:15 AM, Pierre-Yves David wrote:
>>
>>
>> On 11/08/2014 01:27 AM, Mads Kiilerich wrote:
>>> # HG changeset patch
>>> # User Mads Kiilerich <madski at unity3d.com>
>>> # Date 1415409531 -3600
>>> #      Sat Nov 08 02:18:51 2014 +0100
>>> # Branch stable
>>> # Node ID 4f80b7a3cdf219d1c8e5b3a7f2d539cd035cf8c4
>>> # Parent  8f689654b7d3d6b7c2b370cd5e38198b625e4fc6
>>> rebase: handle rebasing of merges of destination ancestors
>>
>> I think we need a schema about what is happening here. As more verbose
>> and documented test could achieve that.
>
> A "schema"? What do you mean?

drawing.

a longer explanation of what you are trying to do, why the previous 
situation is bad and why the new situation is better.

-- 
Pierre-Yves David