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

[Eric Wong <normalperson@yhbt.net>]

Nanako Shiraishi <nanako3@lavabit.com> wrote:
> Quoting Eric Wong <normalperson@yhbt.net>
> > Sam Vilain <sam.vilain@catalyst.net.nz> wrote:
> >> This series adds support for converting SVN merges - in the two
> >> popular formats, SVK and SVN 1.5+, into git parents.
> >
> > Thanks Sam,
> >
> > There's a couple of whitespace issues with lines being too long (using 8
> > character wide tabs).  Otherwise I'm happy to Ack and get them out for
> > more testing/exposure; especially since I'm unlikely to exercise the
> > functionality myself[1] and doesn't appear to break anything.
> >
> > Thanks again.
> 
> What is the status of this series and what should happen now?
> 
> Will Eric add his Ack and send you a pull request, or will you fix 
> them up, forge Eric's Ack and start cooking in your 'next' branch?

Thanks for the ping, I got sidetracked and forgot about this.  I've
fixed up minor formatting details, acked and pushed out Sam's changes to
git://git.bogomips.org/git-svn along with one I small fix I originally
sent out a bad patch for.

Eric Wong (1):
      git svn: fix fetch where glob is on the top-level URL

Sam Vilain (5):
      git-svn: add test data for SVK merge, with script.
      git-svn: allow test setup script to support PERL env. var
      git-svn: convert SVK merge tickets to extra parents
      git-svn: add test data for SVN 1.5+ merge, with script.
      git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents

(tests pass on the same box where I have my latest code this time :)

-- 
Eric Wong