diff options
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 0080ef964..521e5bda6 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -19,7 +19,6 @@ import qualified Annex.Branch import qualified Git import qualified Git.Branch import qualified Command.Sync -import qualified Database.Keys import Annex.TaggedPush import Remote (remoteFromUUID) @@ -90,12 +89,6 @@ onChange file currbranch mergeConfig Git.Branch.AutomaticCommit changedbranch - -- Merging can cause new associated files - -- to appear and the smudge filter will - -- add them to the database. To ensure that - -- this process sees those changes, close - -- the database if it was open. - liftAnnex $ Database.Keys.closeDb mergecurrent _ = noop handleDesynced = case fromTaggedBranch changedbranch of |