From: Brad King <brad.king@kitware.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] submodule: Demonstrate known breakage during recursive merge
Date: Wed, 24 Aug 2011 16:02:03 -0400 [thread overview]
Message-ID: <4E5558BB.4040307@kitware.com> (raw)
In-Reply-To: <20110824194618.GD45292@book.hvoigt.net>
On 8/24/2011 3:14 PM, Heiko Voigt wrote:
> thanks for finding this subtle bug!
Thanks for looking at it!
On 8/24/2011 3:46 PM, Heiko Voigt wrote:
> For the merge search we do not take the bases into
> account so the outcome will not change.
The test case creates history like this:
> b---bc
> / \ /
> o X
> \ / \
> c---cb
where b, c, bc, and cb all reference different submodule commits.
Isn't the merge search asked to search for a descendant of "b:sub" and "c:sub"
during the recursive part of the merge and then "bc:sub" and "cb:sub" during
the primary merge? Might those results be different?
As for the UI part, I think the user would be interested only in the search
results for the primary merge between HEAD and MERGE_HEAD. Results from the
intermediate merges might not make sense.
Thanks,
-Brad
next prev parent reply other threads:[~2011-08-24 20:02 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 [this message]
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=4E5558BB.4040307@kitware.com \
--to=brad.king@kitware.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.