diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
| commit | 070b1a03392ab3962eb43f60f32fde5c1b9b70d2 (patch) | |
| tree | b6097608e2e12c026ca05164fc81148ede79cc23 /Annex/AdjustedBranch.hs | |
| parent | 2caa1330b3abb4bb2ac60eb8b144046d03a1287b (diff) | |
fix auto merge conflict resolution when doing out of tree merge for adjusted branch
Diffstat (limited to 'Annex/AdjustedBranch.hs')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index 8d2d498e6..a30dda809 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -272,7 +272,7 @@ updateAdjustedBranch tomerge (origbranch, adj) commitmode = catchBoolIO $ withemptydir tmpwt $ withWorkTree tmpwt $ do liftIO $ writeFile (tmpgit </> "HEAD") (fromRef updatedorig) showAction $ "Merging into " ++ fromRef (Git.Ref.base origbranch) - ifM (autoMergeFrom tomerge (Just updatedorig) commitmode) + ifM (autoMergeFrom tomerge (Just origbranch) True commitmode) ( do !mergecommit <- liftIO $ extractSha <$> readFile (tmpgit </> "HEAD") -- This is run after the commit lock is dropped. @@ -305,7 +305,7 @@ updateAdjustedBranch tomerge (origbranch, adj) commitmode = catchBoolIO $ adjmergecommit <- commitAdjustedTree' adjtree mergecommit [mergecommit, currbranch] showAction "Merging into adjusted branch" - ifM (autoMergeFrom adjmergecommit (Just currbranch) commitmode) + ifM (autoMergeFrom adjmergecommit (Just currbranch) False commitmode) -- The adjusted branch has a merge commit on top; -- clean that up and propigate any changes made -- in that merge to the origbranch. |