summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-09 13:37:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-09 13:43:47 -0400
commit1c806a0a6c593cc6b4fc82ce3ca709ffd495fa86 (patch)
tree72e68ec88100c795fb74491b3ace77c98810b40d /debian
parenta3bf2712c63958fee1e696bc256900763137ed0f (diff)
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.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c4ca8d2be..79235342c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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