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

improve error when unable to reverse adjust merge

Browse source 
Give the user a hint about what to do, as well as what they should have
done to avoid the problem.
This commit is contained in:
Joey Hess 2025-08-20 13:35:31 -04:00
commit 9db30d60e1
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Annex/AdjustedBranch.hs
View file

@ -579,8 +579,7 @@ rebaseOnTopMsg = "rebasing adjusted branch on top of updated original branch"
- will be lost, and any other headers are not copied either. -} - will be lost, and any other headers are not copied either. -}
reverseAdjustedCommit :: Sha -> Adjustment -> (Sha, Commit) -> OrigBranch -> Annex Sha reverseAdjustedCommit :: Sha -> Adjustment -> (Sha, Commit) -> OrigBranch -> Annex Sha
reverseAdjustedCommit commitparent adj (csha, basiscommit) origbranch reverseAdjustedCommit commitparent adj (csha, basiscommit) origbranch
| length (commitParent basiscommit) > 1 = giveup $ | length (commitParent basiscommit) > 1 = giveup mergeerror
"unable to propagate merge commit " ++ show csha ++ " back to " ++ show origbranch
| otherwise = do | otherwise = do
cmode <- annexCommitMode <$> Annex.getGitConfig cmode <- annexCommitMode <$> Annex.getGitConfig
treesha <- reverseAdjustedTree commitparent adj csha treesha <- reverseAdjustedTree commitparent adj csha
@ -591,6 +590,12 @@ reverseAdjustedCommit commitparent adj (csha, basiscommit) origbranch
[commitMessage basiscommit] [commitMessage basiscommit]
[commitparent] treesha [commitparent] treesha
return revadjcommit return revadjcommit
where
mergeerror = "Unable to propagate merge commit " ++ fromRef csha ++
" back to " ++ fromRef origbranch ++
" from this adjusted branch." ++
" To fix this, reset back to before the merge commit, " ++
" and use: git-annex merge <branch>"
{- Adjusts the tree of the basis, changing only the files that the {- Adjusts the tree of the basis, changing only the files that the
- commit changed, and reverse adjusting those changes. - commit changed, and reverse adjusting those changes.