# HG changeset patch # User Matt Mackall # Date 1242325240 18000 # Node ID 475552c034969d54f7c15115e83b630f90812555 # Parent 850b5a7c210d5e347f59e12ae4d17e35a3a15ce8 status: check cmp list in order diff -r 850b5a7c210d -r 475552c03496 mercurial/localrepo.py --- a/mercurial/localrepo.py Thu May 14 16:22:49 2009 +0200 +++ b/mercurial/localrepo.py Thu May 14 13:20:40 2009 -0500 @@ -1051,7 +1051,7 @@ if parentworking and cmp: fixup = [] # do a full compare of any files that might have changed - for f in cmp: + for f in sorted(cmp): if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) or ctx1[f].cmp(ctx2[f].data())): modified.append(f)