Mercurial > hg

view tests/test-confused-revert.out @ 2032:cd6bdbc508dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't print filenames in braces for changelog style.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 01 Apr 2006 20:56:55 +0200
parents 8d9ec30d58bc
children c9226bcc288d
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
saving current version of b as b.orig
forgetting b
undeleting a
%%% should show b unknown and a back to normal
? b
? b.orig
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
? b.orig
reverting...
forgetting b
undeleting a
%%% should show b unknown and a marked modified (merged)
? b
? b.orig
%%% should show foo-b
foo-b