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

File last commit:

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