##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r5051:e3dffbdc default
r10244:c4c0502b merge default
Show More
test-issue322.out
12 lines | 372 B | text/plain | TextLexer
% 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