Tuomas Suutari <tuomas.suutari@xxxxxxxxx> wrote:
> Hi,
>
> Now that git-svn detects merges from svn:mergeinfo, I thought it's
> time to re-import some of my SVN repos with git-svn. Detecting of the
> merges worked mostly well, but when inspecting the imported history
> with gitk, I found some incorrectly detected merges.
>
> This patch series adds a test case and a fix for the case.
>
> I was a bit uncertain if the fix should go to parents_exclude function
> or to "cater for merges which merge commits from multiple branches"
> section of find_extra_svn_parents function. I chose the latter and at
> least it does the trick.
Thanks Tuomas and Sam+Thomas for the feedback.
I've pushed this series out to git://git.bogomips.org/git-svn along with
Josh's speedup.
Tuomas Suutari (3):
t9151: Fix a few commits in the SVN dump
t9151: Add two new svn:mergeinfo test cases
git-svn: Fix discarding of extra parents from svn:mergeinfo
josh robb (1):
git svn: delay importing SVN::Base until it is needed
--
Eric Wong
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html