From: Jan Pešta Date: Fri, 01 Mar 2013 13:33:07 GMT Subject: [PATCH] In inproperly merges, the ranges contains additional character "*" Message-ID: <002101ce1681$4f261090$ed7231b0$@certicon.cz> In inproperly merges, the ranges contains additional character "*". 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 --- perl/Git/SVN.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 0ebc68a..6bd18e9 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1493,6 +1493,7 @@ sub lookup_svn_merge { my @merged_commit_ranges; # find the tip for my $range ( @ranges ) { + $range =~ s/[*]$//; my ($bottom, $top) = split "-", $range; $top ||= $bottom; my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top ); -- 1.8.1.msysgit.1