X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-svn.perl;h=d0678372b9fd263d1ef896a04cb1fd0d8f1ba564;hb=0866786b80aa921576ab4e7474c91207111f970f;hp=96f373f81a7716b6690a1e9c1519860fcfbc06c6;hpb=40a1530c07a6a720b6cfa52c6132274fac4e4112;p=git.git

diff --git a/git-svn.perl b/git-svn.perl
index 96f373f81..d0678372b 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) {
@@ -3022,7 +3025,7 @@ sub other_gs {
 			my (undef, $max_commit) = $gs->rev_map_max(1);
 			last if (!$max_commit);
 			my ($url) = ::cmt_metadata($max_commit);
-			last if ($url eq $gs->full_url);
+			last if ($url eq $gs->metadata_url);
 			$ref_id .= '-';
 		}
 		print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;