tests/test-confused-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 07 Nov 2006 21:43:19 +0100
changeset 3621 7d3d603e7df9
parent 3095 25857e00af8e
child 6298 53cbb33e1269
permissions -rw-r--r--
localrepo: factor commit and rawcommit note: rawcommit with an empty text will now launch the editor

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