view tests/test-issue322.out @ 5019:e6cc4d4f5a81

Ignore mergebackup files generated by mpatch
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 26 Jul 2007 13:38:20 -0700
parents 3d5547845158
children e3dffbdc6522
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