# HG changeset patch # User Matt Mackall # Date 2009-05-14 18:20:40 # Node ID 475552c034969d54f7c15115e83b630f90812555 # Parent 850b5a7c210d5e347f59e12ae4d17e35a3a15ce8 status: check cmp list in order diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1051,7 +1051,7 @@ class localrepository(repo.repository): 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)