git-svn: add support for merges during 'git svn fetch' · Sam Vilain <hidden> · 2016-06-15
[PATCH 1/5] git-svn: add test data for SVK merge, with script. · Sam Vilain <hidden> · 2016-06-15
[PATCH 2/5] git-svn: allow test setup script to support PERL env. var · Sam Vilain <hidden> · 2016-06-15
[PATCH 3/5] git-svn: convert SVK merge tickets to extra parents · Sam Vilain <hidden> · 2016-06-15
[PATCH 4/5] git-svn: add test data for SVN 1.5+ merge, with script. · Sam Vilain <hidden> · 2016-06-15
[PATCH 5/5] git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents · Sam Vilain <hidden> · 2016-06-15
Re: git-svn: add support for merges during 'git svn fetch' · Sam Vilain <hidden> · 2016-06-15
Re: git-svn: add support for merges during 'git svn fetch' · Eric Wong <hidden> · 2016-06-15
Re: git-svn: add support for merges during 'git svn fetch' · Nanako Shiraishi <hidden> · 2016-06-15
Re: git-svn: add support for merges during 'git svn fetch' · Eric Wong <hidden> · 2016-06-15
Re: git-svn: add support for merges during 'git svn fetch' · Junio C Hamano <hidden> · 2016-06-15

git-svn: add support for merges during 'git svn fetch'

From: Sam Vilain <hidden>
Date: 2016-06-15 22:47:35

This series adds support for converting SVN merges - in the two
popular formats, SVK and SVN 1.5+, into git parents.