[PATCH RFC] merge: don't scan the working dir if it is known to be clean

Matt Mackall mpm at selenic.com
Thu Nov 29 00:21:57 UTC 2012


On Wed, 2012-11-28 at 16:13 -0800, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1354147956 28800
> # Node ID 1da364ca826257dd538b59342142d79319dc2d7c
> # Parent  1d9a1134b2af6dd16c10aa81457876b7a1349b78
> merge: don't scan the working dir if it is known to be clean

Looks like a good idea, but I'm not excited about adding special-use
flags to merge.

Instead, making workingctx's status caching smarter and letter merge
take advantage of that would be better.

Also, graft would want the same sort of attention.

-- 
Mathematics is the supreme nostalgia of our time.





More information about the Mercurial-devel mailing list