From: Heiko Voigt <hvoigt@hvoigt•net>
To: Junio C Hamano <gitster@pobox•com>
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 21:46:18 +0200 [thread overview]
Message-ID: <20110824194618.GD45292@book.hvoigt.net> (raw)
In-Reply-To: <7vty96obo9.fsf@alter.siamese.dyndns.org>
On Wed, Aug 24, 2011 at 12:24:22PM -0700, Junio C Hamano wrote:
> Heiko Voigt <hvoigt@hvoigt•net> writes:
>
> > ... Its a
> > little bit workaroundish so if anymore has an idea how to fix this in
> > nicer way, please tell me.
> >
> > [1]--8<----
> > From: Heiko Voigt <hvoigt@hvoigt•net>
> > Subject: [PATCH] protect submodule merge search against multiple calls for
> > the same path
> >
> > When multiple merge-bases are found for two commits to be merged the
> > merge machinery will ask twice for a merge resolution. Currently its not
> > possible to use the revision-walking api for walking the same commits
> > multiple times.
>
> 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. If just the revision-walking is an
issue: I am currently working on extending it to be able to walk again,
because we also need that for the recursive push series.
But even if we are able to search twice or more (in or out process) we
would give the advice that there are multiple possible resolutions
for each merge base. For the merge search we do not take the bases into
account so the outcome will not change. So what I think would be
cleaner (also UI wise) is to remember whether we already gave advice and
not do it a second time.
Cheers Heiko
next prev parent reply other threads:[~2011-08-24 19:46 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 [this message]
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 ` [PATCH] submodule: Demonstrate known breakage during recursive merge Junio C Hamano
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=20110824194618.GD45292@book.hvoigt.net \
--to=hvoigt@hvoigt$(echo .)net \
--cc=brad.king@kitware$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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