mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

factor out Annex.AutoMerge from Command.Sync

Browse source
This commit is contained in:
Joey Hess 2014-03-04 16:26:15 -04:00
parent 33aae51175
commit 99295f2c1d
3 changed files with 184 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/Merger.hs
View file

@ -17,7 +17,7 @@ import Utility.DirWatcher.Types
import qualified Annex.Branch
import qualified Git
import qualified Git.Branch
import qualified Command.Sync
import Annex.AutoMerge
import Annex.TaggedPush
import Remote (remoteFromUUID)
@ -83,7 +83,7 @@ onChange file
[ "merging", Git.fromRef changedbranch
, "into", Git.fromRef current
]
void $ liftAnnex $ Command.Sync.mergeFrom changedbranch
void $ liftAnnex $ autoMergeFrom changedbranch
mergecurrent _ = noop
handleDesynced = case fromTaggedBranch changedbranch of