From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: recur status on linux-2.6
Date: Sun, 13 Aug 2006 20:16:29 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.63.0608132006510.10541@wbgn013.biozentrum.uni-wuerzburg.de> (raw)
In-Reply-To: <7v64gwmv2j.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sun, 13 Aug 2006, Junio C Hamano wrote:
> 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).
Well, my guess for these 14 merge bases is that you merge a lot between
topic branches.
As for the worse half-merge: I get only this difference:
-100644 fad39ff609f3ea27981e7a9ffdfc29731d1065d0 1 upload-pack.c
+100644 b6cc43c3c89c68e950c6d86298c928e9aab25e70 1 upload-pack.c
So, after both -recur and -recursive, upload-pack.c is in the index in an
unmerged state.
The difference between fad39ff6 (from -recur) and b6cc43c3 (from
-recursive) is that this block
-- snip --
if (nr_has < MAX_HAS) {
struct object *o = lookup_object(sha1);
if (!(o && o->parsed))
o = parse_object(sha1);
if (!o)
die("oops (%s)", sha1_to_hex(sha1));
if (o->type == OBJ_COMMIT) {
struct commit_list *parents;
if (o->flags & THEY_HAVE)
return 0;
o->flags |= THEY_HAVE;
for (parents = ((struct commit*)o)->parents;
parents;
parents = parents->next)
parents->item->object.flags |= THEY_HAVE;
}
memcpy(has_sha1[nr_has++], sha1, 20);
-- snap --
is inserted after (-recur), instead of before (-recursive), the clashing
block
-- snip --
o = lookup_object(sha1);
if (!(o && o->parsed))
o = parse_object(sha1);
if (!o)
die("oops (%s)", sha1_to_hex(sha1));
if (o->type == TYPE_COMMIT) {
struct commit_list *parents;
if (o->flags & THEY_HAVE)
return 0;
o->flags |= THEY_HAVE;
for (parents = ((struct commit*)o)->parents;
parents;
parents = parents->next)
parents->item->object.flags |= THEY_HAVE;
-- snap --
So, the order is actually saner, since one expects the upstream (newer)
version to come after the "====" line.
I fail to see how this is worse than -recursive...
Ciao,
Dscho
next prev parent reply other threads:[~2006-08-13 18:16 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
2006-08-13 18:16 ` Johannes Schindelin [this message]
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=Pine.LNX.4.63.0608132006510.10541@wbgn013.biozentrum.uni-wuerzburg.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).