tests/test-confused-revert.out
author Brendan Cully <brendan@kublai.com>
Mon, 07 Aug 2006 14:48:24 -0700
changeset 2817 ff3edd1c1e27
parent 2214 6c6c0e5595a2
child 3095 25857e00af8e
permissions -rw-r--r--
Add basic qsave/qrestore test.

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