From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jeff King" <peff@peff.net>,
"Martin Ågren" <martin.agren@gmail.com>,
git@vger.kernel.org, "Eric Sunshine" <sunshine@sunshineco.com>
Subject: Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`
Date: Thu, 7 Feb 2019 22:34:31 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1902072233070.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqy36rpki1.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Thu, 7 Feb 2019, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > Even when there are even only as much as 12 merge bases to test (which is
> > the current number of merge bases between `next` and `pu`),...
> > ...
> > And I sadly have to report that that's not the end of it. Back when I
> > implemented the automatic bisect after failed builds (for details, see
> > https://github.com/git-for-windows/build-extra/commit/c7e01e82c), I had to
> > turn it off real quickly because the dumb bisect between `next` and `pu`
> > regularly ran into the 4h timeout.
>
> Would it make it easier for you if you substituted all the mention
> of 'next' in your message with 'pu^{/^### match next}'?
I was working on this in 2017, and could not make it to work as I wanted.
Ever since, that bisect code has been dormant.
In the meantime, I was able to parallelize the test suite enough to make
it feasible to test the topic branches. That usually takes care of things
really quickly, and I just bite the bullet and bisect manually.
Ciao,
Dscho
>
> That mid-point between 'master' and 'pu' is designed to contain
> exactly the same set of non-merge commits 'next' has, with the tree
> that is identical to that of 'next', and from there to the tip of
> 'pu' forms a single strand of merges of tips of topic branches that
> are not yet merged to 'next' (by definition, it itself is the merge
> base of it and 'pu').
>
> Bisecting along the first-parent chain from there to the tip of 'pu'
> would let us identify which merge is faulty as the first-and-quick
> pass and currently there are about 20 merges in that range on the
> first-parent chain.
>
>
next prev parent reply other threads:[~2019-02-07 21:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-03 8:35 [PATCH] doc-diff: don't `cd_to_toplevel` before calling `usage` Martin Ågren
2019-02-03 9:08 ` Eric Sunshine
2019-02-03 9:11 ` Eric Sunshine
2019-02-03 10:35 ` Martin Ågren
2019-02-03 11:01 ` Eric Sunshine
2019-02-03 11:08 ` [PATCH v2] " Martin Ågren
2019-02-03 23:01 ` Jeff King
2019-02-04 20:50 ` [PATCH v3] doc-diff: don't `cd_to_toplevel` Martin Ågren
2019-02-04 23:34 ` Jeff King
2019-02-05 10:34 ` Johannes Schindelin
2019-02-05 18:45 ` Junio C Hamano
2019-02-06 12:20 ` Johannes Schindelin
2019-02-06 17:24 ` Junio C Hamano
2019-02-06 18:55 ` Jeff King
2019-02-07 15:41 ` Johannes Schindelin
2019-02-07 17:37 ` Junio C Hamano
2019-02-07 21:34 ` Johannes Schindelin [this message]
2019-02-07 20:49 ` Jeff King
2019-02-07 21:42 ` Johannes Schindelin
2019-02-06 18:49 ` Jeff King
2019-02-07 14:26 ` Johannes Schindelin
2019-02-07 20:45 ` Jeff King
2019-02-07 21:57 ` Johannes Schindelin
2019-02-08 2:53 ` Jeff King
2019-02-08 4:34 ` Jeff King
2019-02-08 0:58 ` SZEDER Gábor
2019-02-08 2:51 ` Jeff 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
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=nycvar.QRO.7.76.6.1902072233070.41@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/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).