Re: [PATCH] git-svn: support svnmerge.py merge tickets from pre svn 1.5.0 releases

From: Eric Wong <normalperson@yhbt.net>
Date: Apr 11, 2010, 01:02 UTC
Message-ID: <20100411010242.GB22778@dcvr.yhbt.net>
In-Reply-To: <loom.20100402T005055-989@post.gmane.org>

Mark Bryars <git@darkskiez.co.uk> wrote:

Show 6 quoted lines

> 
> I currently have an SVN 1.3.x repository and am using the old svnmerge.py script
> to manage merges with it, it would be nice to migrate to git without first
> upgrading to SVN 1.5+, running the converter tool, and then migrating to git.
> This small patch allows me to skip that step by referencing the old property
> names in the repo.

Show 13 quoted lines

> Regards,
>  Mark Bryars
> 
> From 15856073779bfdd1c5367ea9e01a55242c1e7568 Mon Sep 17 00:00:00 2001
> From: Mark Bryars <git@darkskiez.co.uk>
> Date: Thu, 1 Apr 2010 23:30:37 +0100
> Subject: [PATCH] git-svn: support svnmerge.py merge tickets from pre svn 1.5.0
> releases
> 
> Pre svn 1.5.0 svnmerge.py used svnmerge-integrated properties.
> Small patch to check for these and apply them.
> 
> Signed-off-by: Mark Bryars <git@darkskiez.co.uk>

Thanks Mark, your patch looks good.

I've reworded the commit message to include parts in your email but not
the commit message.  I've pushed this out to
  git://git.bogomips.org/git-svn

------------------------------------------------------------------------
  git-svn: support svnmerge.py merge tickets from SVN < 1.5.0

  SVN < 1.5.0 svnmerge.py used the "svnmerge-integrated" property
  instead of the current "svn:mergeinfo" property.  This change
  allows git-svn to work directly with older SVN < 1.5.0
  svnmerge.py repositories without upgrading to SVN 1.5+ first
  and converting the properties.

  [ew: reworded commit message]

  Signed-off-by: Mark Bryars <git@darkskiez.co.uk>
  Acked-by: Eric Wong <normalperson@yhbt.net>
------------------------------------------------------------------------

If the message makes sense to you, I'll ask Junio to pull.

Sorry for the late response, I haven't gotten a chance to check this list for a while...

Thanks again!

-- 
Eric Wong