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

use sync command merge engine in assistant

Browse source 
To handle direct mode merging.
This commit is contained in:
Joey Hess 2012-12-25 14:10:07 -04:00
parent 9fcfcab485
commit 8a8380f1b7
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/Threads/Merger.hs
View file

@ -14,8 +14,8 @@ import Utility.DirWatcher
import Utility.Types.DirWatcher
import qualified Annex.Branch
import qualified Git
import qualified Git.Merge
import qualified Git.Branch
import qualified Command.Sync
thisThread :: ThreadName
thisThread = "Merger"
@ -80,8 +80,7 @@ onAdd file
[ "merging", show changedbranch
, "into", show current
]
void $ liftAnnex $ inRepo $
Git.Merge.mergeNonInteractive changedbranch
void $ liftAnnex $ Command.Sync.mergeFrom changedbranch
mergecurrent _ = noop
equivBranches :: Git.Ref -> Git.Ref -> Bool