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

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

[Mark Bryars]

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.

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>
---
 git-svn.perl |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 2c86ea2..79eef5d 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3304,6 +3304,12 @@ sub make_log_entry {
 				 $props->{"svn:mergeinfo"},
 				 \@parents);
 		}
+		if ( $props->{"svnmerge-integrated"} ) {
+			$self->find_extra_svn_parents
+				($ed,
+				 $props->{"svnmerge-integrated"},
+				 \@parents);
+		}
 	}
 
 	open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
-- 
1.7.0.3

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

[Eric Wong]

Mark Bryars <git@darkskiez.co.uk> wrote:
> 
> 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.
 
> 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