tests/test-confused-revert.out
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Mon, 12 Jul 2010 09:19:28 +0300
branchstable
changeset 11536 92342fa9fbd8
parent 6336 4b0c9c674707
permissions -rw-r--r--
rebase: add a test for committed MQ patches (59bd20451ab6)

%%% 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
created new head
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)
M a
? b
%%% should show foo-b
foo-b