diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-08 14:15:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-08 14:15:55 -0800 |
| commit | 1cc625fd7a97f3335c837526cae36100adcd697f (patch) | |
| tree | 9d068241731d391d82bbe87f991ecd159c1792a5 | |
| parent | 3e714cdbab0387984e918aac2ad460abbd0ba1c9 (diff) | |
| parent | eae6cf5aa8ae2d8a90a99bbe4aeb01c29e01fd02 (diff) | |
| download | git-1cc625fd7a97f3335c837526cae36100adcd697f.tar.gz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git svn: consistent spacing after "W:" in warnings
git svn: ignore partial svn:mergeinfo
| -rw-r--r-- | perl/Git/SVN.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 0ebc68ac7e..5273ee8867 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1493,13 +1493,18 @@ 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 ); my $top_commit = $gs->find_rev_before( $top, 1, $bottom ); 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"; next; } |