##// END OF EJS Templates
status: change + back out == clean (API)...
Martin von Zweigbergk -
r27720:89f49813 default
parent child Browse files
Show More
@@ -140,15 +140,9 b' class basectx(object):'
140 added.append(fn)
140 added.append(fn)
141 elif node2 is None:
141 elif node2 is None:
142 removed.append(fn)
142 removed.append(fn)
143 elif node2 != _newnode:
144 # The file was not a new file in mf2, so an entry
145 # from diff is really a difference.
146 modified.append(fn)
147 elif flag1 != flag2:
143 elif flag1 != flag2:
148 modified.append(fn)
144 modified.append(fn)
149 elif self[fn].cmp(other[fn]):
145 elif self[fn].cmp(other[fn]):
150 # node2 was newnode, but the working file doesn't
151 # match the one in mf1.
152 modified.append(fn)
146 modified.append(fn)
153 else:
147 else:
154 clean.append(fn)
148 clean.append(fn)
@@ -388,6 +388,14 b' reverted file with changed flag should a'
388
388
389 #endif
389 #endif
390
390
391 reverted and commit change should appear clean
392
393 $ hg revert -r 0 .
394 reverting file
395 $ hg ci -m a
396 $ hg status -A --rev 0 --rev 2
397 C file
398
391 $ cd ..
399 $ cd ..
392
400
393 hg status of binary file starting with '\1\n', a separator for metadata:
401 hg status of binary file starting with '\1\n', a separator for metadata:
General Comments 0
You need to be logged in to leave comments. Login now