##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Display symlink or executable bit with manifest -v...
Display symlink or executable bit with manifest -v New output looks like: 644 a 755 * b/a 644 @ l
Brendan Cully - - Load All Authors

File last commit:

r3095:25857e00 default
r5405:8feb33c2 default
Show More
test-confused-revert.out
27 lines | 694 B | text/plain | TextLexer
/ tests / test-confused-revert.out
History | Annotation | Raw |Copy content |Copy permalink
%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% should show b unknown and a back to normal
? b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
%%% revert should fail
abort: uncommitted merge - please provide a specific revision
%%% revert should be ok now
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b