tests/test-confused-revert.out
author James Abbatiello <abbeyj at gmail.com>
Tue, 14 Jul 2009 22:42:05 -0400
changeset 9129 395b0e132836
parent 6336 4b0c9c674707
permissions -rw-r--r--
Don't copy hidden files/directories during `setup.py install` This is useful if a copy of Mercurial is stored in a Subversion repository so that the .svn directories don't get copied.

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