From: Junio C Hamano <junkio@cox.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: recur status on linux-2.6
Date: Sun, 13 Aug 2006 09:58:28 -0700 [thread overview]
Message-ID: <7v64gwmv2j.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.63.0608131550290.10541@wbgn013.biozentrum.uni-wuerzburg.de> (Johannes Schindelin's message of "Sun, 13 Aug 2006 15:54:19 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> I tested git-merge-recur vs. git-merge-recursive on the linux-2.6
> repository last night. It contains 2298 two-head merges. _All_ of them
> come out identically with -recur as compared to -recursive (looking at
> the resulting index only).
Nice.
> That was the good news. The bad news is: it _seems_, that -recur is only
> about 6x faster than -recursive, not 10x, and this number becomes smaller,
> the longer the merge takes. So I see a startup effect here, probably.
Recreating the tip of "next" (10a6653) might be fun. I do not
know why, but it ended up having 14 merge bases. The speed-up
is about 6x, and the resulting half-merge is worse than
recursive (not using rerere cache).
next prev parent reply other threads:[~2006-08-13 16:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-13 13:54 recur status on linux-2.6 Johannes Schindelin
2006-08-13 16:58 ` Junio C Hamano [this message]
2006-08-13 18:16 ` Johannes Schindelin
2006-08-13 19:44 ` Junio C Hamano
2006-08-13 20:43 ` Johannes Schindelin
2006-08-18 4:09 ` Junio C Hamano
2006-08-18 10:00 ` Johannes Schindelin
2006-08-19 10:46 ` Fredrik Kuivinen
2006-08-22 8:27 ` Junio C Hamano
2006-08-22 13:57 ` Johannes Schindelin
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=7v64gwmv2j.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).