Mercurial > hg

view tests/test-confused-revert.out @ 3561:8c617d48564a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add AIX to the list of compilers that don't have inline keyword
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 27 Oct 2006 10:24:19 +0200
parents 25857e00af8e
children 53cbb33e1269
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
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)
? b
%%% should show foo-b
foo-b