Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 2094:c067ee483d2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix filerevision-raw.tmpl Two bugs: - conteXt-type instead of conteNt-type - trailing newline The easiest way to fix the second one (and keep it fixed) is to put everything inline in map-raw.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 19 Apr 2006 11:39:34 -0700
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