From 98c4ab32f80d00d0254bfdcab8d934dcda6a7504 Mon Sep 17 00:00:00 2001 From: Bryan Jacobs Date: Wed, 31 Aug 2011 12:48:39 -0400 Subject: git-svn: Teach dcommit --mergeinfo to handle multiple lines "svn dcommit --mergeinfo" replaces the svn:mergeinfo property in an upstream SVN repository with the given text. The svn:mergeinfo property may contain commits originating on multiple branches, separated by newlines. Cause space characters in the mergeinfo to be replaced by newlines, allowing a user to create history representing multiple branches being merged into one. Update the corresponding documentation and add a test for the new functionality. Signed-off-by: Bryan Jacobs Acked-by: Sam Vilain Acked-by: Eric Wong --- git-svn.perl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'git-svn.perl') diff --git a/git-svn.perl b/git-svn.perl index 32792d3ef3..d0678372b9 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -559,6 +559,9 @@ sub cmd_dcommit { } my $expect_url = $url; Git::SVN::remove_username($expect_url); + if (defined($_merge_info)) { + $_merge_info =~ tr{ }{\n}; + } while (1) { my $d = shift @$linear_refs or last; unless (defined $last_rev) { -- cgit v1.2.1