##// END OF EJS Templates
status: back out changeset 89f49813526c...
Martin von Zweigbergk -
r27747:54522bbe default
parent child Browse files
Show More
@@ -140,9 +140,15 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)
143 elif flag1 != flag2:
147 elif flag1 != flag2:
144 modified.append(fn)
148 modified.append(fn)
145 elif self[fn].cmp(other[fn]):
149 elif self[fn].cmp(other[fn]):
150 # node2 was newnode, but the working file doesn't
151 # match the one in mf1.
146 modified.append(fn)
152 modified.append(fn)
147 else:
153 else:
148 clean.append(fn)
154 clean.append(fn)
@@ -390,14 +390,6 b' reverted file with changed flag should a'
390 reverting file
390 reverting file
391 #endif
391 #endif
392
392
393 reverted and commit change should appear clean
394
395 $ hg ci -m a
396 $ hg status -A --rev 0 --rev 2
397 C file
398
399 $ cd ..
400
401 hg status of binary file starting with '\1\n', a separator for metadata:
393 hg status of binary file starting with '\1\n', a separator for metadata:
402
394
403 $ hg init repo5
395 $ hg init repo5
General Comments 0
You need to be logged in to leave comments. Login now