changeset 8395 | 475552c03496 |
parent 8393 | 59160ca338f7 |
child 8397 | 613ac2856535 |
--- 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)