##// END OF EJS Templates
tests: removed redundant "-d '0 0'" from test scripts...
tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default.

File last commit:

r6336:4b0c9c67 default
r8167:6c82beaa default
Show More
test-confused-revert.out
29 lines | 715 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
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
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)
Alexis S. L. Carvalho
normallookup: during merges, restore the state saved by remove
r6298 M a
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
r1449 ? b
%%% should show foo-b
foo-b