tests/test-issue322.out
author Martin Geisler <mg@aragost.com>
Thu, 12 Aug 2010 18:10:26 +0200
changeset 11828 5a64302e5d3a
parent 5051 e3dffbdc6522
permissions -rw-r--r--
i18n: merge with stable

% 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