Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 2054:e18beba54a7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix exception handling on windows. move win32 code into util_win32.py.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 08 Apr 2006 14:12:43 -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