Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 2152:57729c56a23c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show repo's revlog format on verify only if it doesn't match the default format. This makes it easier to run the tests with different revlog formats.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Apr 2006 21:52:08 +0200
parents 968f036f93a4
children b2ae81a7df29
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
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b