tests/test-issue322.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 15 Apr 2010 15:34:27 +0200
changeset 10918 1d8a13bb42ae
parent 5051 e3dffbdc6522
permissions -rw-r--r--
add +x to test-update-renames, removed by the merge on 24ed7a541f23

% 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