mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.bogomips.org/git-svn

Browse Source 
* git://git.bogomips.org/git-svn:
  git svn: consistent spacing after "W:" in warnings
  git svn: ignore partial svn:mergeinfo
This commit is contained in:
Junio C Hamano
2013-03-08 14:15:55 -08:00
parent 3e714cdbab eae6cf5aa8
commit 1cc625fd7a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
perl/Git/SVN.pm
View File

@ -1493,13 +1493,18 @@ sub lookup_svn_merge {
my @merged_commit_ranges; my @merged_commit_ranges;
# find the tip # find the tip
for my $range ( @ranges ) { for my $range ( @ranges ) {
if ($range =~ /[*]$/) {
warn "W: Ignoring partial merge in svn:mergeinfo "
."dirprop: $source:$range\n";
next;
}
my ($bottom, $top) = split "-", $range; my ($bottom, $top) = split "-", $range;
$top ||= $bottom; $top ||= $bottom;
my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top ); my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
my $top_commit = $gs->find_rev_before( $top, 1, $bottom ); my $top_commit = $gs->find_rev_before( $top, 1, $bottom );
unless ($top_commit and $bottom_commit) { unless ($top_commit and $bottom_commit) {
warn "W:unknown path/rev in svn:mergeinfo " warn "W: unknown path/rev in svn:mergeinfo "
."dirprop: $source:$range\n"; ."dirprop: $source:$range\n";
next; next;
} }