From: Jan Pešta <jan.pesta@certicon.cz>
Date: Thu, 7 Mar 2013 11:28:14 +0000 (+0100)
Subject: git svn: ignore partial svn:mergeinfo
X-Git-Tag: v1.8.2~7^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47543d161ebe550c412d99aaa6b9e7e5ae88fab5;p=git

git svn: ignore partial svn:mergeinfo

Currently this is cosmetic change - the merges are ignored, becuase the methods
(lookup_svn_merge, find_rev_before, find_rev_after) are failing on comparing text with number.

See http://www.open.collab.net/community/subversion/articles/merge-info.html
Extract:
The range r30430:30435 that was added to 1.5.x in this merge has a '*' suffix for 1.5.x\www.
This '*' is the marker for a non-inheritable mergeinfo range.
The '*' means that only the path on which the mergeinfo is explicitly set has had this range merged into it.

Signed-off-by: Jan Pesta <jan.pesta@certicon.cz>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 0ebc68ac7e..46aeb85f6c 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1493,6 +1493,11 @@ sub lookup_svn_merge {
 	my @merged_commit_ranges;
 	# find the tip
 	for my $range ( @ranges ) {
+		if ($range =~ /[*]$/) {
+			warn "W: Ignoring partial merge in svn:mergeinfo "
+				."dirprop: $source:$range\n";
+			next;
+		}
 		my ($bottom, $top) = split "-", $range;
 		$top ||= $bottom;
 		my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );