diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-29 15:57:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-29 15:57:47 -0400 |
| commit | 6d4ab4dc7389e2184d32962b751268125dfa56ae (patch) | |
| tree | 9d3f29e122aa92e82d499580b4ffb84be8619eba /Annex | |
| parent | 453ba048af869ed731e54f39b8b9db7d6859510a (diff) | |
make assistant aware of adjusted branches when merging
Diffstat (limited to 'Annex')
| -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 1579a1f2f..8acaa0514 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -120,6 +120,6 @@ commitAdjustedTree treesha parent = go =<< catCommit parent {- Update the currently checked out adjusted branch, merging the provided - branch into it. -} -updateAdjustedBranch :: Adjustment -> OrigBranch -> Branch -> Annex Bool -updateAdjustedBranch mergebranch = do +updateAdjustedBranch :: Branch -> (OrigBranch, Adjustment) -> Git.Branch.CommitMode -> Annex Bool +updateAdjustedBranch tomerge (origbranch, adj) commitmode = do error "updateAdjustedBranch" |