[PATCH] git-svn: support svnmerge.py merge tickets from pre svn 1.5.0 releases
- From
- Mark Bryars <git@darkskiez.co.uk>
- Date
- Apr 1, 2010, 22:54 UTC
- Message-ID
- <loom.20100402T005055-989@post.gmane.org>
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