Skip to content

Commit

Permalink
git svn: ignore partial svn:mergeinfo
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jan Pešta authored and Eric Wong committed Mar 8, 2013
1 parent aadb70a commit 47543d1
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions perl/Git/SVN.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down

0 comments on commit 47543d1

Please sign in to comment.