@@ -1433,7 +1433,7 @@ sub check_author {
14331433}
14341434
14351435sub find_extra_svk_parents {
1436- my ($self , $ed , $ tickets , $parents ) = @_ ;
1436+ my ($self , $tickets , $parents ) = @_ ;
14371437 # aha! svk:merge property changed...
14381438 my @tickets = split " \n " , $tickets ;
14391439 my @known_parents ;
@@ -1736,7 +1736,7 @@ sub mergeinfo_changes {
17361736# note: this function should only be called if the various dirprops
17371737# have actually changed
17381738sub find_extra_svn_parents {
1739- my ($self , $ed , $ mergeinfo , $parents ) = @_ ;
1739+ my ($self , $mergeinfo , $parents ) = @_ ;
17401740 # aha! svk:merge property changed...
17411741
17421742 memoize_svn_mergeinfo_functions();
@@ -1835,16 +1835,14 @@ sub make_log_entry {
18351835 my @parents = @$parents ;
18361836 my $props = $ed -> {dir_prop }{$self -> path};
18371837 if ( $props -> {" svk:merge" } ) {
1838- $self -> find_extra_svk_parents
1839- ($ed , $props -> {" svk:merge" }, \@parents );
1838+ $self -> find_extra_svk_parents($props -> {" svk:merge" }, \@parents );
18401839 }
18411840 if ( $props -> {" svn:mergeinfo" } ) {
18421841 my $mi_changes = $self -> mergeinfo_changes
18431842 ($parent_path , $parent_rev ,
18441843 $self -> path, $rev ,
18451844 $props -> {" svn:mergeinfo" });
1846- $self -> find_extra_svn_parents
1847- ($ed , $mi_changes , \@parents );
1845+ $self -> find_extra_svn_parents($mi_changes , \@parents );
18481846 }
18491847
18501848 open my $un , ' >>' , " $self ->{dir}/unhandled.log" or croak $! ;
0 commit comments