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>
Jan Pešta committed
Mar 7, 2013 at 12:28 UTC
47543d161ebe550c412d99aaa6b9e7e5ae88fab5
1 file changed
+5
perl/Git/SVN.pm
+5
@@ -1493,6 +1493,11 @@ sub lookup_svn_merge {
1493
my @merged_commit_ranges;
1494
# find the tip
1495
for my $range ( @ranges ) {
1496
+ if ($range =~ /[*]$/) {
1497
+ warn "W: Ignoring partial merge in svn:mergeinfo "
1498
+ ."dirprop: $source:$range\n";
1499
+ next;
1500
+ }
1501
my ($bottom, $top) = split "-", $range;
1502
$top ||= $bottom;
1503
my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );