Darcs more updates

patches/darcs-2.16.5.patch

@@ -268,6 +268,58 @@ index 72ea398..afe755d 100644
                        http-types        >= 0.12.1 && < 0.12.4
  
      if flag(warn-as-error)
+diff --git a/src/Darcs/Patch/Annotate.hs b/src/Darcs/Patch/Annotate.hs
+index ede4b1d..0dc9e5e 100644
+--- a/src/Darcs/Patch/Annotate.hs
++++ b/src/Darcs/Patch/Annotate.hs
+@@ -43,7 +43,8 @@ module Darcs.Patch.Annotate
+ 
+ import Darcs.Prelude
+ 
+-import Control.Monad.State ( modify, modify', when, gets, State, execState )
++import Control.Monad.State ( modify, modify', gets, State, execState )
++import Control.Monad
+ 
+ import qualified Data.ByteString as B
+ import qualified Data.ByteString.Char8 as BC
+diff --git a/src/Darcs/Patch/Index/Monad.hs b/src/Darcs/Patch/Index/Monad.hs
+index 385045a..630a224 100644
+--- a/src/Darcs/Patch/Index/Monad.hs
++++ b/src/Darcs/Patch/Index/Monad.hs
+@@ -30,6 +30,7 @@ import Darcs.Patch.Index.Types ( PatchMod(..), PatchId(..) )
+ import Darcs.Patch.Info ( makePatchname, PatchInfo )
+ import Darcs.Patch.Apply ( Apply(..) )
+ import Darcs.Patch.ApplyMonad ( ApplyMonad(..), ApplyMonadTree(..) )
++import Control.Monad
+ import Control.Monad.State
+ import Control.Arrow
+ import Darcs.Util.Path ( AnchoredPath, anchorPath, movedirfilename, isPrefix )
+diff --git a/src/Darcs/UI/Commands/Log.hs b/src/Darcs/UI/Commands/Log.hs
+index d93f649..758ebef 100644
+--- a/src/Darcs/UI/Commands/Log.hs
++++ b/src/Darcs/UI/Commands/Log.hs
+@@ -23,6 +23,7 @@ module Darcs.UI.Commands.Log
+     , simpleLogInfo -- for darcsden
+     ) where
+ 
++import Control.Monad
+ import Darcs.Prelude
+ 
+ import Data.List ( intersect, find )
+diff --git a/src/Darcs/Util/Tree/Hashed.hs b/src/Darcs/Util/Tree/Hashed.hs
+index 669a443..076cbe9 100644
+--- a/src/Darcs/Util/Tree/Hashed.hs
++++ b/src/Darcs/Util/Tree/Hashed.hs
+@@ -40,7 +40,8 @@ import qualified Data.ByteString as B
+ 
+ import Data.List( sortBy )
+ import Data.Maybe( fromJust, isJust )
+-import Control.Monad.State.Strict (liftIO,when,unless)
++import Control.Monad
++import Control.Monad.State.Strict (liftIO)
+ 
+ import Darcs.Prelude
+ 
 diff --git a/src/Darcs/Util/Tree/Monad.hs b/src/Darcs/Util/Tree/Monad.hs
 index f639766..8947aea 100644
 --- a/src/Darcs/Util/Tree/Monad.hs