view tests/test-issue322.out @ 10879:29030b7f664a

merge default
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 09 Apr 2010 15:16:31 +0200
parents e3dffbdc6522
children
line wrap: on
line source

% 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