Mercurial > hg > pyhgsh

view tests/test-confused-revert.out @ 2042:a514c7509fa9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small changes to revert command. fix bug 93: work with files that are in target manifest but not dirstate.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 03 Apr 2006 10:02:09 -0700
parents c9226bcc288d
children 968f036f93a4
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
? b.orig
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
? b.orig
reverting...
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
? b.orig
%%% should show foo-b
foo-b