{"thread":{"id":"23294","subject":"[PATCH] git-svn: support svnmerge.py merge tickets from pre svn 1.5.0 releases","startedAt":"2010-04-01T22:54:50Z","lastAt":"2010-04-11T01:02:42Z","messageCount":2,"participants":["Mark Bryars","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"138370","messageId":"loom.20100402T005055-989@post.gmane.org","threadId":"23294","inReplyTo":null,"subject":"[PATCH] git-svn: support svnmerge.py merge tickets from pre svn 1.5.0 releases","fromName":"Mark Bryars","fromEmail":"git@darkskiez.co.uk","sentAt":"2010-04-01T22:54:50Z","receivedAt":"2010-04-01T22:54:50Z","isPatch":true,"sender":{"key":"git@darkskiez.co.uk","avatar":null},"body":"\nI currently have an SVN 1.3.x repository and am using the old svnmerge.py script\nto manage merges with it, it would be nice to migrate to git without first\nupgrading to SVN 1.5+, running the converter tool, and then migrating to git.\nThis small patch allows me to skip that step by referencing the old property\nnames in the repo.\n\nRegards,\n Mark Bryars\n\n\n\n>From 15856073779bfdd1c5367ea9e01a55242c1e7568 Mon Sep 17 00:00:00 2001\nFrom: Mark Bryars <git@darkskiez.co.uk>\nDate: Thu, 1 Apr 2010 23:30:37 +0100\nSubject: [PATCH] git-svn: support svnmerge.py merge tickets from pre svn 1.5.0\nreleases\n\nPre svn 1.5.0 svnmerge.py used svnmerge-integrated properties.\nSmall patch to check for these and apply them.\n\nSigned-off-by: Mark Bryars <git@darkskiez.co.uk>\n---\n git-svn.perl |    6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 2c86ea2..79eef5d 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -3304,6 +3304,12 @@ sub make_log_entry {\n \t\t\t\t $props->{\"svn:mergeinfo\"},\n \t\t\t\t \\@parents);\n \t\t}\n+\t\tif ( $props->{\"svnmerge-integrated\"} ) {\n+\t\t\t$self->find_extra_svn_parents\n+\t\t\t\t($ed,\n+\t\t\t\t $props->{\"svnmerge-integrated\"},\n+\t\t\t\t \\@parents);\n+\t\t}\n \t}\n \n \topen my $un, '>>', \"$self->{dir}/unhandled.log\" or croak $!;\n-- \n1.7.0.3\n"},{"id":"139222","messageId":"20100411010242.GB22778@dcvr.yhbt.net","threadId":"23294","inReplyTo":"loom.20100402T005055-989@post.gmane.org","subject":"Re: [PATCH] git-svn: support svnmerge.py merge tickets from pre svn 1.5.0 releases","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-04-11T01:02:42Z","receivedAt":"2010-04-11T01:02:42Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Mark Bryars <git@darkskiez.co.uk> wrote:\n> \n> I currently have an SVN 1.3.x repository and am using the old svnmerge.py script\n> to manage merges with it, it would be nice to migrate to git without first\n> upgrading to SVN 1.5+, running the converter tool, and then migrating to git.\n> This small patch allows me to skip that step by referencing the old property\n> names in the repo.\n \n> Regards,\n>  Mark Bryars\n> \n> From 15856073779bfdd1c5367ea9e01a55242c1e7568 Mon Sep 17 00:00:00 2001\n> From: Mark Bryars <git@darkskiez.co.uk>\n> Date: Thu, 1 Apr 2010 23:30:37 +0100\n> Subject: [PATCH] git-svn: support svnmerge.py merge tickets from pre svn 1.5.0\n> releases\n> \n> Pre svn 1.5.0 svnmerge.py used svnmerge-integrated properties.\n> Small patch to check for these and apply them.\n> \n> Signed-off-by: Mark Bryars <git@darkskiez.co.uk>\n\nThanks Mark, your patch looks good.\n\nI've reworded the commit message to include parts in your email but not\nthe commit message.  I've pushed this out to\n  git://git.bogomips.org/git-svn\n\n------------------------------------------------------------------------\n  git-svn: support svnmerge.py merge tickets from SVN < 1.5.0\n\n  SVN < 1.5.0 svnmerge.py used the \"svnmerge-integrated\" property\n  instead of the current \"svn:mergeinfo\" property.  This change\n  allows git-svn to work directly with older SVN < 1.5.0\n  svnmerge.py repositories without upgrading to SVN 1.5+ first\n  and converting the properties.\n\n  [ew: reworded commit message]\n\n  Signed-off-by: Mark Bryars <git@darkskiez.co.uk>\n  Acked-by: Eric Wong <normalperson@yhbt.net>\n------------------------------------------------------------------------\n\nIf the message makes sense to you, I'll ask Junio to pull.\n\nSorry for the late response, I haven't gotten a chance to\ncheck this list for a while...\n\nThanks again!\n-- \nEric Wong\n"}]}