##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

keyword: mimic cmdutil.bail_if_changed even more...
keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r5051:e3dffbdc default
r6672:6004eedb default
Show More
test-issue322.out
12 lines | 372 B | text/plain | TextLexer
/ tests / test-issue322.out
History | Annotation | Raw |Copy content |Copy permalink
% 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