summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorBryan Jacobs <bjacobs@woti.com>2011-08-31 16:48:39 (GMT)
committerEric Wong <normalperson@yhbt.net>2011-09-01 19:55:09 (GMT)
commit98c4ab32f80d00d0254bfdcab8d934dcda6a7504 (patch)
treec129f11b84e4faf77db205fd41181fba67306e1d /git-svn.perl
parent85f022e9c124ffeda31a50cab878e1418d694d87 (diff)
downloadgit-98c4ab32f80d00d0254bfdcab8d934dcda6a7504.zip
git-98c4ab32f80d00d0254bfdcab8d934dcda6a7504.tar.gz
git-98c4ab32f80d00d0254bfdcab8d934dcda6a7504.tar.bz2
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 <bjacobs@woti.com> Acked-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 32792d3..d067837 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) {