tests/test-confused-revert.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 08 Oct 2006 20:27:23 -0300
changeset 3317 399c04369a1b
parent 3095 25857e00af8e
child 6298 53cbb33e1269
permissions -rw-r--r--
fix bash completion of debug commands; add test for debugcomplete The debugconfig -> showconfig renaming broke things.

%%% 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