Mercurial > hg
comparison mercurial/localrepo.py @ 8395:475552c03496
status: check cmp list in order
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 14 May 2009 13:20:40 -0500 |
| parents | 59160ca338f7 |
| children | 613ac2856535 |
comparison
equal
deleted
inserted
replaced
| 8394:850b5a7c210d | 8395:475552c03496 |
|---|---|
| 1049 | 1049 |
| 1050 # check for any possibly clean files | 1050 # check for any possibly clean files |
| 1051 if parentworking and cmp: | 1051 if parentworking and cmp: |
| 1052 fixup = [] | 1052 fixup = [] |
| 1053 # do a full compare of any files that might have changed | 1053 # do a full compare of any files that might have changed |
| 1054 for f in cmp: | 1054 for f in sorted(cmp): |
| 1055 if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) | 1055 if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) |
| 1056 or ctx1[f].cmp(ctx2[f].data())): | 1056 or ctx1[f].cmp(ctx2[f].data())): |
| 1057 modified.append(f) | 1057 modified.append(f) |
| 1058 else: | 1058 else: |
| 1059 fixup.append(f) | 1059 fixup.append(f) |