[PATCH 2 of 2 rfc] diff: search beyond ancestor when detecting renames

Matt Mackall mpm at selenic.com
Fri Nov 8 13:55:05 CST 2013


On Fri, 2013-11-08 at 03:49 +0100, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1383878972 -3600
> #      Fri Nov 08 03:49:32 2013 +0100
> # Branch stable
> # Node ID 79b83373ff5e66b61eaccafa3fc2bd7487e06476
> # Parent  d3df4d706b86fa1780f6156a033062a7f617cd4c
> diff: search beyond ancestor when detecting renames
> 
> This removes an optimization that was introduced in 91eb4512edd0 but seems to
> be too aggressive - as indicated by how it changed test-mq-merge.t .
> 
> Removing the optimization will in some cases give a different and arguably more
> correct result. It will probably also introduce a significant performance
> regression in other cases.

This probably wants a limit calculated like copies._findlimit, but
perhaps calculated at a higher level.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list