mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
aadb70a559
commit
47543d161e
|
@ -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 );
|
||||
|
|
Loading…
Reference in a new issue