Mercurial > hg

view tests/test-confused-revert.out @ 9726:430e59ff3437

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keepalive: handle broken pipes gracefully during large POSTs
author Augie Fackler <durin42@gmail.com>
date Mon, 02 Nov 2009 11:03:22 -0500
parents 4b0c9c674707
children
line wrap: on
line source

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