diff --git a/Assistant/Threads/Transferrer.hs b/Assistant/Threads/Transferrer.hs index 575307d240..d8212768a3 100644 --- a/Assistant/Threads/Transferrer.hs +++ b/Assistant/Threads/Transferrer.hs @@ -20,6 +20,7 @@ import Annex.Content import qualified Remote import Types.Key import Locations.UserConfig +import Assistant.Threads.TransferWatcher import System.Process (create_group) @@ -46,6 +47,7 @@ startTransfer program t info = case (transferRemote info, associatedFile info) o , do debug [ "Skipping unnecessary transfer:" , describeTransfer t info ] void $ removeTransfer t + finishedTransfer t (Just info) return Nothing ) _ -> return Nothing diff --git a/debian/changelog b/debian/changelog index 1d87d65b6b..a437c6ebcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ git-annex (4.20130228) UNRELEASED; urgency=low * assistant: Logs are rotated to avoid them using too much disk space. * assistant: Avoid noise in logs from git commit about typechanged files in direct mode repositories. + * assistant: Fix dropping content when a file is moved to an archive + directory. -- Joey Hess Wed, 27 Feb 2013 23:20:40 -0400