diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-04 14:38:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-04 14:38:29 -0400 |
| commit | 228ccffdacd4386134d20418d173675b3becd85d (patch) | |
| tree | dab3fb5d15354929e81743dd061ae809e7173ba2 /Annex/AdjustedBranch.hs | |
| parent | d9c5096d738427cebe33c9eee1887235598b36e3 (diff) | |
todo
Diffstat (limited to 'Annex/AdjustedBranch.hs')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index 43af5d372..a70c3a75d 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -238,8 +238,9 @@ updateAdjustedBranch tomerge (origbranch, adj) commitmode = catchBoolIO $ void $ propigateAdjustedCommits' origbranch (adj, currbranch) commitsprevented adjustedtomerge <- adjust adj mergesha ifM (inRepo $ Git.Branch.changed currbranch adjustedtomerge) - ( return $ + ( return $ do -- Run after commit lock is dropped. + liftIO $ print ("autoMergeFrom", adjustedtomerge, (Just currbranch)) ifM (autoMergeFrom adjustedtomerge (Just currbranch) commitmode) ( preventCommits $ \_ -> recommit currbranch mergesha =<< catCommit currbranch |