tests/test-issue322.out
author Sune Foldager <cryo@cyanite.org>
Mon, 13 Sep 2010 16:12:25 +0200
branchstable
changeset 12277 a7d3147bd4b3
parent 5051 e3dffbdc6522
permissions -rw-r--r--
color: add win32 support for non-black background This complicates the code a bit, since attributes need to be masked together correctly before they are applied. Perhaps the code should be redesigned at some point, but this works well for now.

% file replaced with directory
adding a
% should fail - would corrupt dirstate
abort: file 'a' in dirstate clashes with 'a/a'
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
abort: directory 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
abort: directory 'b' already in dirstate