view tests/test-issue322.out @ 5148:a04694e08775

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 11 Aug 2007 13:35:25 +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