From: Junio C Hamano <gitster@pobox.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Brad King <brad.king@kitware.com>, git@vger.kernel.org
Subject: Re: [PATCH] submodule: Demonstrate known breakage during recursive merge
Date: Wed, 24 Aug 2011 15:43:56 -0700 [thread overview]
Message-ID: <7v39gqo2fn.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110824194618.GD45292@book.hvoigt.net> (Heiko Voigt's message of "Wed, 24 Aug 2011 21:46:18 +0200")
Heiko Voigt <hvoigt@hvoigt.net> writes:
>> I have been suspecting that most of this should be done in a separate
>> helper program that is run via run_command() interface, without
>> contaminating the object pool the main merge process has with data from
>> the submodule object store to begin with (i.e. add_submodule_odb() and
>> everything below should go). Wouldn't it be a lot cleaner solution?
>
> Hmm, I would like to keep it in process. Since there are platforms where
> spawning new processes is very slow.
Adding submodule's odb into the main process _will_ also have performance
penalties because it will make it more expensive to look up objects that
belong to the superproject when the superproject wants its own look up.
In case you haven't realized yet, walking revision graph multiple times
while making sure that you do not affect other revision traversals in
effect is hard to arrange right. But more importantly, correctness counts
more than performing quickly and giving a bogus result with premature
optimization that makes it harder to implement things correctly (and
harder to verify the change is correct).
next prev parent reply other threads:[~2011-08-24 22:44 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-24 13:59 [PATCH] submodule: Demonstrate known breakage during recursive merge Brad King
2011-08-24 19:14 ` Heiko Voigt
2011-08-24 19:24 ` Junio C Hamano
2011-08-24 19:46 ` Heiko Voigt
2011-08-24 20:02 ` Brad King
2011-08-24 20:27 ` Heiko Voigt
2011-08-24 20:40 ` Brad King
2011-08-24 21:32 ` Heiko Voigt
2011-08-25 16:49 ` [PATCH] rev-list: Demonstrate breakage with --ancestry-path --all Brad King
2011-08-25 23:08 ` Junio C Hamano
2011-08-25 23:49 ` Junio C Hamano
2011-08-26 1:00 ` [PATCH 1/2] revision: keep track of the end-user input from the command line Junio C Hamano
2011-08-26 1:08 ` Sverre Rabbelier
2011-08-26 2:21 ` Junio C Hamano
2011-08-26 1:00 ` [PATCH 2/2] revision: do not include sibling history in --ancestry-path output Junio C Hamano
2011-08-26 12:51 ` Brad King
2011-08-24 22:43 ` Junio C Hamano [this message]
2011-08-25 21:11 ` [PATCH] allow multiple calls to submodule merge search for the same path Heiko Voigt
2011-08-25 23:22 ` Junio C Hamano
2011-08-25 23:28 ` Junio C Hamano
2011-08-25 23:39 ` Junio C Hamano
2011-08-25 12:28 ` [PATCH v2] submodule: Demonstrate known breakage during recursive merge Brad King
2011-08-26 14:18 ` [PATCH/RFC] submodule: Search for merges only at end of " Brad King
2011-08-26 19:04 ` Junio C Hamano
2011-08-26 19:30 ` [PATCH v2/RFC] " Brad King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v39gqo2fn.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=brad.king@kitware.com \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.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.
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 NNTP newsgroup(s).