git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Why isn't 'jch' based on 'next'?

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 15, 2021, 19:46 UTC
Message-ID
<xmqq35vrqqjt.fsf@gitster.g>
In-Reply-To
<xmqqlf9jqucm.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 8 quoted lines
> 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'.
Previous: Junio C Hamano
Message 3 of 3 in “Why isn't 'jch' based on 'next'?”
  1. Denton LiuApr 15, 2021
  2. Junio C HamanoApr 15, 2021
  3. Junio C HamanoApr 15, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.