tests/test-confused-revert.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 20 Aug 2006 00:44:53 -0300
changeset 2960 61afc32c1a49
parent 2214 6c6c0e5595a2
child 3095 25857e00af8e
permissions -rw-r--r--
Avoid Python 2.5 warning demandload.py:112: Warning: 'as' will become a reserved keyword in Python 2.6

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