[PATCH 1 of 2 stable] tests: add test for rebasing merges with ancestors of the rebase destination

[Pierre-Yves David]

On 11/08/2014 01:27 AM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1415409335 -3600
> #      Sat Nov 08 02:15:35 2014 +0100
> # Branch stable
> # Node ID 8f689654b7d3d6b7c2b370cd5e38198b625e4fc6
> # Parent  c35ffa4249cab47a1e089a30bc16fc65a0727f48
> tests: add test for rebasing merges with ancestors of the rebase destination

More thinking and discussion about this convinced me that this change is 
bad and will introduce mishaviour (if some important change are 
introduced during a merge for eg we'll silently drop them).

I'm dropping this series and waiting for Mads to provide more extensive 
explanation of what are the problematic case, why is rebase behaving sub 
optimally and how we could fixes it properly.

-- 
Pierre-Yves David