view tests/test-issue322.out @ 4312:82be6af21697

Merge with Matt
author Brendan Cully <brendan@kublai.com>
date Thu, 05 Apr 2007 14:55:27 -0700
parents 3d5547845158
children
line wrap: on
line source

% file replaced with directory
adding a
% should fail - would corrupt dirstate
abort: file named 'a' already in dirstate
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
abort: directory named 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
abort: directory named 'b' already in dirstate