better handling of overwriting an existing file/directory/broken link when importing

Previous test did not notice if there is a dangling symlink.

Also, if a directory exists with the same name as the imported file, that
cannot work, so don't let --force have an effect.
This commit is contained in:
Joey Hess 2013-12-09 13:37:18 -04:00
parent c668ed35be
commit 9f68bb546c
2 changed files with 11 additions and 5 deletions

2
debian/changelog vendored
View file

@ -17,6 +17,8 @@ git-annex (5.20131131) UNRELEASED; urgency=low
* import: Add --skip-duplicates option.
* Windows: watch and assistant work! (very experimental)
* lock: Require --force. Closes: #731606
* import: better handling of overwriting an existing file/directory/broken
link when importing
-- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400