From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Why isn't 'jch' based on 'next'?
Date: Thu, 15 Apr 2021 12:46:30 -0700 [thread overview]
Message-ID: <xmqq35vrqqjt.fsf@gitster.g> (raw)
In-Reply-To: <xmqqlf9jqucm.fsf@gitster.g> (Junio C. Hamano's message of "Thu, 15 Apr 2021 11:24:25 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> So if we reset 'seen' at 'master' and merge the tip of these topics
> into it, the tree of the empty commit that is marked with "### match
> next" marker should match the tree of 'next', or something is still
> wrong (most likely, a mismerge). Also, the order topics are merged
> into 'next' may not be necessarily the order they appear in 'seen'.
> Every time I rebuild 'seen' from 'master', I have a chance to reorder
> these topics so that the ones that are expected to graduate sooner
> come near the bottom.
This is so that I can "git checkout seen~40" (or whereever point
that has all the topics scheduled to be in 'master' and nothing
else) and run tests, to simulate what happens if these topics
graduate to 'master'.
> By ensuring "### match next" and 'next' matches, even though they
> came to their trees in different route, I can spot a mismerge that
> is waiting to happen soon when a topic graduates to 'master'.
prev parent reply other threads:[~2021-04-15 19:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 9:12 Why isn't 'jch' based on 'next'? Denton Liu
2021-04-15 18:24 ` Junio C Hamano
2021-04-15 19:46 ` Junio C Hamano [this message]
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=xmqq35vrqqjt.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.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.
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.