tests/test-confused-revert.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 08 Apr 2006 14:12:43 -0700
changeset 2054 e18beba54a7e
parent 2043 968f036f93a4
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix exception handling on windows. move win32 code into util_win32.py.

%%% 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