diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-17 11:49:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-17 11:49:59 -0400 |
| commit | b9a9684880e2ee2604240ec6f91273e55dd485e7 (patch) | |
| tree | 4bc5aa0598ea94df71f982349e75a02fd59a957b | |
| parent | 40652e0eaf019ce076fcee24c25fb1f8c950ac5d (diff) | |
Fix dropping of files using the URL backend.
(cherry picked from commit 7b5b1276085be3d2c12c8c28b7be1aceccae44f9)
Conflicts:
doc/bugs/dropping_files_with_a_URL_backend_fails.mdwn
| -rw-r--r-- | Backend/URL.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Backend/URL.hs b/Backend/URL.hs index 29dc8fefa..1a76d2aeb 100644 --- a/Backend/URL.hs +++ b/Backend/URL.hs @@ -42,7 +42,7 @@ dummyStore :: FilePath -> Key -> Annex Bool dummyStore _ _ = return False dummyRemove :: Key -> Maybe a -> Annex Bool -dummyRemove _ _ = return False +dummyRemove _ _ = return True dummyFsck :: Key -> Maybe FilePath -> Maybe a -> Annex Bool dummyFsck _ _ _ = return True diff --git a/debian/changelog b/debian/changelog index f5fc4eebe..4a924be87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (0.25) UNRELEASED; urgency=low + + * Fix dropping of files using the URL backend. + + -- Joey Hess <joeyh@debian.org> Thu, 17 Mar 2011 11:46:53 -0400 + git-annex (0.24) unstable; urgency=low Branched the 0.24 series, which will be maintained for a while to |