##// END OF EJS Templates
status: revert + flag-change == modified...
Martin von Zweigbergk -
r27668:369c8f94 default
parent child Browse files
Show More
@@ -144,6 +144,8 b' class basectx(object):'
144 # The file was not a new file in mf2, so an entry
144 # The file was not a new file in mf2, so an entry
145 # from diff is really a difference.
145 # from diff is really a difference.
146 modified.append(fn)
146 modified.append(fn)
147 elif flag1 != flag2:
148 modified.append(fn)
147 elif self[fn].cmp(other[fn]):
149 elif self[fn].cmp(other[fn]):
148 # node2 was newnode, but the working file doesn't
150 # node2 was newnode, but the working file doesn't
149 # match the one in mf1.
151 # match the one in mf1.
@@ -362,6 +362,34 b' hg status -A --change 1 and revset:'
362
362
363 $ cd ..
363 $ cd ..
364
364
365 hg status with --rev and reverted changes:
366
367 $ hg init reverted-changes-repo
368 $ cd reverted-changes-repo
369 $ echo a > file
370 $ hg add file
371 $ hg ci -m a
372 $ echo b > file
373 $ hg ci -m b
374
375 reverted file should appear clean
376
377 $ hg revert -r 0 .
378 reverting file
379 $ hg status -A --rev 0
380 C file
381
382 #if execbit
383 reverted file with changed flag should appear modified
384
385 $ chmod +x file
386 $ hg status -A --rev 0
387 M file
388
389 #endif
390
391 $ cd ..
392
365 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:
366
394
367 $ hg init repo5
395 $ hg init repo5
General Comments 0
You need to be logged in to leave comments. Login now