Mercurial > hg

view tests/test-confused-revert.out @ 11462:1b82a26635d7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: qimport cleanup on fail (issue2214) save state of successfully added patches and ensure cleanup on the way out.
author Vishakh H <vsh426@gmail.com>
date Tue, 29 Jun 2010 03:09:42 +0530
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