tests/test-issue322.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 02 Oct 2007 13:49:36 -0700
changeset 5356 b98c377b3c16
parent 5051 e3dffbdc6522
permissions -rw-r--r--
Merge with crew.

% 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