[PATCH 08 of 16] merge: use ancestor filename from planning phase instead of filectx ancestor

Matt Mackall mpm at selenic.com
Wed Apr 2 18:53:19 CDT 2014


On Sun, 2014-03-02 at 20:15 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1393356608 -3600
> #      Tue Feb 25 20:30:08 2014 +0100
> # Node ID 5ccd6ac8072b4d7077959cbe4bdf2b2f49488688
> # Parent  3ab2e810c8c530c687ca47144a1802511839654d
> 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.

This one is queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list