Show More
@@ -1051,7 +1051,7 b' class localrepository(repo.repository):' | |||||
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) |
General Comments 0
You need to be logged in to leave comments.
Login now