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

fix auto merge conflict resolution when doing out of tree merge for adjusted branch

Browse source
This commit is contained in:
Joey Hess 2016-04-06 17:32:04 -04:00
parent b9e4e2ba84
commit 60bdffe43e
Failed to extract signature
6 changed files with 60 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/ResolveMerge.hs
View file

@ -29,7 +29,7 @@ start = do
let merge_head = d </> "MERGE_HEAD"
them <- fromMaybe (error nomergehead) . extractSha
<$> liftIO (readFile merge_head)
ifM (resolveMerge (Just us) them)
ifM (resolveMerge (Just us) them False)
( do
void $ commitResolvedMerge Git.Branch.ManualCommit
next $ next $ return True

2
Command/Sync.hs
View file

@ -170,7 +170,7 @@ merge :: CurrBranch -> Git.Branch.CommitMode -> Git.Branch -> Annex Bool
merge (Just b, Just adj) commitmode tomerge =
updateAdjustedBranch tomerge (b, adj) commitmode
merge (b, _) commitmode tomerge =
autoMergeFrom tomerge b commitmode
autoMergeFrom tomerge b False commitmode
syncBranch :: Git.Branch -> Git.Branch
syncBranch = Git.Ref.under "refs/heads/synced" . fromDirectBranch . fromAdjustedBranch