summaryrefslogtreecommitdiff
path: root/perl/Git/SVN.pm
diff options
context:
space:
mode:
authorJan PeŇ°ta <jan.pesta@certicon.cz>2013-03-07 11:28:14 (GMT)
committerEric Wong <normalperson@yhbt.net>2013-03-08 09:46:03 (GMT)
commit47543d161ebe550c412d99aaa6b9e7e5ae88fab5 (patch)
tree756dc24d722d082ddcf65deba292d27f5c842441 /perl/Git/SVN.pm
parentaadb70a5594222cac215f9590017f05d5d0f31b2 (diff)
downloadgit-47543d161ebe550c412d99aaa6b9e7e5ae88fab5.zip
git-47543d161ebe550c412d99aaa6b9e7e5ae88fab5.tar.gz
git-47543d161ebe550c412d99aaa6b9e7e5ae88fab5.tar.bz2
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>
Diffstat (limited to 'perl/Git/SVN.pm')
-rw-r--r--perl/Git/SVN.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 0ebc68a..46aeb85 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 );