From: "Александр Овчинников" <proff@proff.email>
To: Eric Wong <e@80x24.org>, Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Jakob Stoklund Olesen <stoklund@2pi.dk>,
Sam Vilain <sam@vilain.net>,
Steven Walter <stevenrwalter@gmail.com>,
Peter Baumann <waste.manager@gmx.de>,
Andrew Myrick <amyrick@apple.com>,
Michael Contreras <michael@inetric.com>
Subject: Re: may be bug in svn fetch no-follow-parent
Date: Fri, 24 Jun 2016 13:57:06 +0300 [thread overview]
Message-ID: <3485951466765826@web27g.yandex.ru> (raw)
In-Reply-To: <20160622225839.GA30828@dcvr.yhbt.net>
https://s3-eu-west-1.amazonaws.com/profff/mergeinfo.zip
even ordinary merge may take up to 20-30 minutes. I'll try to trace in future
23.06.2016, 01:58, "Eric Wong" <e@80x24.org>:
> Александр Овчинников <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@web24o.yandex.ru
>
> Signed-off-by: Eric Wong <e@80x24.org>
> ---
> 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
prev parent reply other threads:[~2016-06-24 11:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 7:36 may be bug in svn fetch no-follow-parent Александр Овчинников
2016-06-20 21:52 ` Eric Wong
[not found] ` <2518541466501215@web27h.yandex.ru>
2016-06-22 22:58 ` Eric Wong
2016-06-24 10:57 ` Александр Овчинников [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3485951466765826@web27g.yandex.ru \
--to=proff@proff.email \
--cc=amyrick@apple.com \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=michael@inetric.com \
--cc=sam@vilain.net \
--cc=stevenrwalter@gmail.com \
--cc=stoklund@2pi.dk \
--cc=waste.manager@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).