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

working toward adjusted commit propigation

Browse source
This commit is contained in:
Joey Hess 2016-03-03 16:19:09 -04:00
parent 7811556a5b
commit cf24e9b892
Failed to extract signature
4 changed files with 112 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Command/Sync.hs
View file

@ -267,21 +267,20 @@ pushLocal b = do
updateSyncBranch :: CurrBranch -> Annex ()
updateSyncBranch (Nothing, _) = noop
updateSyncBranch (Just branch, _) = do
updateSyncBranch (Just branch, madj) = do
-- When in an adjusted branch, propigate any changes to it back to
-- the original branch.
branch' <- case adjustedToOriginal branch of
Just (adj, origbranch) -> do
propigateAdjustedCommits origbranch adj
return origbranch
Nothing -> return branch
case madj of
Just adj -> propigateAdjustedCommits branch
(adj, originalToAdjusted branch adj)
Nothing -> return ()
-- Update the sync branch to match the new state of the branch
inRepo $ updateBranch (syncBranch branch') branch'
inRepo $ updateBranch (syncBranch branch) branch
-- In direct mode, we're operating on some special direct mode
-- branch, rather than the intended branch, so update the intended
-- branch.
whenM isDirect $
inRepo $ updateBranch (fromDirectBranch branch') branch'
inRepo $ updateBranch (fromDirectBranch branch) branch
updateBranch :: Git.Branch -> Git.Branch -> Git.Repo -> IO ()
updateBranch syncbranch updateto g =