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

File last commit:

r5051:e3dffbdc default
r6986:55c16f12 merge default
Show More
test-issue322.out
12 lines | 372 B | text/plain | TextLexer
/ tests / test-issue322.out
Vadim Gelfer
fix issue 322....
r2953 % file replaced with directory
adding a
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
r5051 abort: file 'a' in dirstate clashes with 'a/a'
Vadim Gelfer
fix issue 322....
r2953 % directory replaced with file
adding a/a
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
r5051 abort: directory 'a' already in dirstate
Vadim Gelfer
fix issue 322....
r2953 % directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
Alexis S. L. Carvalho
update tests output
r5051 abort: directory 'b' already in dirstate