Skip to content

Commit

Permalink
Merge git://git.bogomips.org/git-svn
Browse files Browse the repository at this point in the history
* git://git.bogomips.org/git-svn:
  git svn: consistent spacing after "W:" in warnings
  git svn: ignore partial svn:mergeinfo
  • Loading branch information
Junio C Hamano committed Mar 8, 2013
2 parents 3e714cd + eae6cf5 commit 1cc625f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion perl/Git/SVN.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 1cc625f

Please sign in to comment.