tests/test-confused-revert.out
author Christian Ebert <blacktrash@gmx.net>
Wed, 26 Jul 2006 15:21:20 +0200
changeset 2678 a781df9b5faa
parent 2214 6c6c0e5595a2
child 3092 25857e00af8e
permissions -rw-r--r--
fix reference to "smtp" section documentation for "method" has reference to "mail" section. "mail" section doesn't exist, changed to "smtp".

%%% 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: working dir has two parents; you must specify the revision to revert to
%%% 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