##// END OF EJS Templates
make manifest friendlier...
make manifest friendlier switch to using context code ..which uses first parent by default show file hashes only with debug switch show permissions with verbose fix up tests

File last commit:

r3095:25857e00 default
r3736:ad3d5b43 default
Show More
test-confused-revert.out
27 lines | 694 B | text/plain | TextLexer
/ tests / test-confused-revert.out
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
r1449 %%% should show a removed and b added
A b
R a
reverting...
Vadim Gelfer
small changes to revert command....
r2042 undeleting a
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 forgetting b
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
r1449 %%% should show b unknown and a back to normal
? b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
r1449 merging a
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
r1449 %%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
Vadim Gelfer
make test-confused-revert check working dir with two parents.
r2214 %%% revert should fail
Brendan Cully
cat: default to working dir parent instead of tip...
r3095 abort: uncommitted merge - please provide a specific revision
Vadim Gelfer
make test-confused-revert check working dir with two parents.
r2214 %%% revert should be ok now
Vadim Gelfer
small changes to revert command....
r2042 undeleting a
Vadim Gelfer
rewrite revert command. fix issues 93, 123, 147....
r2029 forgetting b
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
r1449 %%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b