Given the repository that previously existed in SVN and is now fully converted to Git (that is, it is currently accessible via "clean" git, not git svn):
For the mainline branch and the release branch, which deviated from the main line before the Git conversion:
Is there any simple way (from Git) to indicate which commits are present in the release branch, and not in the main line branch (i.e. possible candidates that will be selected on the black line when fixed directly to the release branch) ?
The problem I see is that commands like git cherry(which seems to be the right choice for branches that diverge after a Git conversion) expect the full commits to remain untouched, but merges made in SVN before conversion tend to be coagulation - mostly crushed cherries instead of intact cherries.
In SVN, this is done by checking the property svn:mergeinfo(usually automatically using tools). I don’t know if this information was saved during the conversion process, or if there are any tools that know to look for them in the obviously native Git repository.
source
share