tests/test-confused-revert.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Sat, 06 Feb 2010 11:28:03 +0100
changeset 10326 8b90e2966219
parent 6336 4b0c9c674707
permissions -rw-r--r--
commands: deprecate the heads -a option Hopefully we can remove it entirely in two releases or so.

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