Skip to content

Commit 47543d1

Browse files
jan-pestaEric Wong
authored andcommitted
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 <[email protected]> Signed-off-by: Eric Wong <[email protected]>
1 parent aadb70a commit 47543d1

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

perl/Git/SVN.pm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,11 @@ sub lookup_svn_merge {
14931493
my @merged_commit_ranges;
14941494
# find the tip
14951495
for my $range ( @ranges ) {
1496+
if ($range =~ /[*]$/) {
1497+
warn "W: Ignoring partial merge in svn:mergeinfo "
1498+
."dirprop: $source:$range\n";
1499+
next;
1500+
}
14961501
my ($bottom, $top) = split "-", $range;
14971502
$top ||= $bottom;
14981503
my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );

0 commit comments

Comments
 (0)