Merge branch 'ew/mboxrd-format-am'

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index b2c14e2ff5485f49af83530ce1b1921c99641f5c..bee1e7d1cba38242cb7f457011a96cd3d02a6653 100644 (file)
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -97,7 +97,8 @@ sub resolve_local_globs {
                                    "existing: $existing\n",
                                    " globbed: $refname\n";
                        }
-                       my $u = (::cmt_metadata("$refname"))[0];
+                       my $u = (::cmt_metadata("$refname"))[0] or die
+                           "$refname: no associated commit metadata\n";
                        $u =~ s!^\Q$url\E(/|$)!! or die
                          "$refname: '$url' not found in '$u'\n";
                        if ($pathname ne $u) {
@@ -1904,15 +1905,22 @@ sub make_log_entry {
 
        my @parents = @$parents;
        my $props = $ed->{dir_prop}{$self->path};
-       if ( $props->{"svk:merge"} ) {
-               $self->find_extra_svk_parents($props->{"svk:merge"}, \@parents);
-       }
-       if ( $props->{"svn:mergeinfo"} ) {
-               my $mi_changes = $self->mergeinfo_changes
-                       ($parent_path, $parent_rev,
-                        $self->path, $rev,
-                        $props->{"svn:mergeinfo"});
-               $self->find_extra_svn_parents($mi_changes, \@parents);
+       if ($self->follow_parent) {
+               my $tickets = $props->{"svk:merge"};
+               if ($tickets) {
+                       $self->find_extra_svk_parents($tickets, \@parents);
+               }
+
+               my $mergeinfo_prop = $props->{"svn:mergeinfo"};
+               if ($mergeinfo_prop) {
+                       my $mi_changes = $self->mergeinfo_changes(
+                                               $parent_path,
+                                               $parent_rev,
+                                               $self->path,
+                                               $rev,
+                                               $mergeinfo_prop);
+                       $self->find_extra_svn_parents($mi_changes, \@parents);
+               }
        }
 
        open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;