Александр Овчинников <proff@proff.email> wrote: > Unfortunately this is not open source repository. I agree that it is pointless try to handle mergeinfo (because it always fails). > Cases when it is expensive: > 1. delete and restore mergeinfo property > 2. merge trunk to very old branch > 3. create, delete, create branch with --no-follow-parent. All records in mergeinfo will be hadled like new. > > I already patched like this and this is helpfull, works fine and fast. Thanks for the info. Patch + pull request below for Junio. > I can share only mergeinfo property Oops, looks like your zip attachment got flagged as spam for my mailbox and swallowed by vger.kernel.org :x ---------8<-------- Subject: [PATCH] git-svn: skip mergeinfo handling with --no-follow-parent For repositories without parent following enabled, finding git parents through svn:mergeinfo or svk::parents can be expensive and pointless. Reported-by: Александр Овчинников <proff@proff.email> http://mid.gmane.org/4094761466408188@xxxxxxxxxxxxxxxx Signed-off-by: Eric Wong <e@xxxxxxxxx> --- The following changes since commit ab7797dbe95fff38d9265869ea367020046db118: Start the post-2.9 cycle (2016-06-20 11:06:49 -0700) are available in the git repository at: git://bogomips.org/git-svn.git svn-nfp-mergeinfo for you to fetch changes up to 6d523a3ab76cfa4ed9ae0ed9da7af43efcff3f07: git-svn: skip mergeinfo handling with --no-follow-parent (2016-06-22 22:48:54 +0000) ---------------------------------------------------------------- Eric Wong (1): git-svn: skip mergeinfo handling with --no-follow-parent perl/Git/SVN.pm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index d94d01c..bee1e7d 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1905,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 $!; -- EW -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html