diff options
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch/Transitions.hs | 1 | ||||
| -rw-r--r-- | Annex/Drop.hs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Annex/Branch/Transitions.hs b/Annex/Branch/Transitions.hs index 84cd1bbd9..95d47257a 100644 --- a/Annex/Branch/Transitions.hs +++ b/Annex/Branch/Transitions.hs @@ -41,6 +41,7 @@ dropDead f content trustmap = case getLogVariety f of in if null newlog then RemoveFile else ChangeFile $ Presence.showLog newlog + Just SingleValueLog -> PreserveFile Nothing -> PreserveFile dropDeadFromUUIDBasedLog :: TrustMap -> UUIDBased.Log String -> UUIDBased.Log String diff --git a/Annex/Drop.hs b/Annex/Drop.hs index 6386f11bb..e307852f2 100644 --- a/Annex/Drop.hs +++ b/Annex/Drop.hs @@ -8,7 +8,6 @@ module Annex.Drop where import Common.Annex -import Logs.Location import Logs.Trust import Types.Remote (uuid) import qualified Remote @@ -18,7 +17,6 @@ import Annex.Wanted import Annex.Exception import Config import Annex.Content.Direct -import RunCommand import qualified Data.Set as S import System.Log.Logger (debugM) |