view tests/test-confused-revert.out @ 2064:547ede0123a2

util.unlink should only catch OSError.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 13 Apr 2006 13:46:56 -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