Show More
@@ -23,6 +23,7 b' from .node import (' | |||||
23 | nullrev, |
|
23 | nullrev, | |
24 | short, |
|
24 | short, | |
25 | wdirid, |
|
25 | wdirid, | |
|
26 | wdirnodes, | |||
26 | ) |
|
27 | ) | |
27 | from . import ( |
|
28 | from . import ( | |
28 | encoding, |
|
29 | encoding, | |
@@ -140,7 +141,7 b' class basectx(object):' | |||||
140 | removed.append(fn) |
|
141 | removed.append(fn) | |
141 | elif flag1 != flag2: |
|
142 | elif flag1 != flag2: | |
142 | modified.append(fn) |
|
143 | modified.append(fn) | |
143 |
elif node2 |
|
144 | elif node2 not in wdirnodes: | |
144 | # When comparing files between two commits, we save time by |
|
145 | # When comparing files between two commits, we save time by | |
145 | # not comparing the file contents when the nodeids differ. |
|
146 | # not comparing the file contents when the nodeids differ. | |
146 | # Note that this means we incorrectly report a reverted change |
|
147 | # Note that this means we incorrectly report a reverted change |
General Comments 0
You need to be logged in to leave comments.
Login now