[PATCH 2 of 4] BUGGY: merge: use ancestor filename from planning phase instead of filectx ancestor

[Mads Kiilerich]

On 02/25/2014 05:50 AM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1393303803 -3600
> #      Tue Feb 25 05:50:03 2014 +0100
> # Node ID 252fe2a2bcab6c32d1ccae258577b54500b043f6
> # Parent  fc9e91fa8deed5f9e056bc3f6b188e5f4dbbdc5e
> BUGGY: merge: use ancestor filename from planning phase instead of filectx ancestor
>
> test-merge-types.t changes a bit in flag merging. It relied on the
> implementation detail that 100% identical revlog entries are reused. The revlog
> reuse did that fctx.ancestor() saw an ancestor where there really not was one.
>
> The other test changes are because the approach taken here fails when
> copies.mergecopies doesn't detect/report when a file has been renamed the same
> way on both sides :-(

Any ideas to how this should be fixed? Do you agree it is worth doing 
it? Also because this seems to be one of the blockers for consensus merge.

/Mads