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

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

addremove: correctly handle intermediate symlinks...
addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).
Alexis S. L. Carvalho - - Load All Authors

File last commit:

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