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

Re: en/rebase-backend (was Re: "rebase -ri" (was Re: Problems with ra/rebase-i-more-options - should we revert it?))

From
Emily Shaffer <emilyshaffer@google.com>
Date
Jan 14, 2020, 20:59 UTC
Message-ID
<20200114205651.GA74460@google.com>
In-Reply-To
<CABPp-BG9eqbhnzU8gzJ_h+=XH4mSOj-Wb5SU7OjXz5ik6c+NnQ@mail.gmail.com>
On Tue, Jan 14, 2020 at 08:52:57AM -0800, Elijah Newren wrote:
Show 36 quoted lines
> Hi Junio,
> 
> On Mon, Jan 13, 2020 at 2:07 PM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > Junio C Hamano <gitster@pobox.com> writes:
> >
> > > Junio C Hamano <gitster@pobox.com> writes:
> > >
> > >> I will push out what I wish to be able to tag as the final [*1*]
> > >> shortly but without actually tagging, so that it can get a bit wider
> > >> exposure than just the usual "Gitster tested locally and then did
> > >> let Travis try them" testing.
> > >
> > > I haven't heard from any failure report so (taking no news as good
> > > news) I'll cut the final today based on what is already on the
> > > public repositories everywhere.
> >
> > By the way, as one of the methods to double check that my result of
> > reverting the merge made sense, I ran "git rebase -ri v2.24.0 pu"
> > and excised the merge and the problematic topic out of the todo
> > list.  With the rerere database populated beforehand, it was more or
> > less a painless exercise (except for one topic, en/rebase-backend,
> > which is one of the topics that was queued forking 'master' after
> > the topic got merged *and* actually depended on what the topic did)
> > and after about 1700+ steps (which did not take more than 20
> > minutes, including the time spent for the manual rebasing of
> > en/rebase-backend topic) I got the same tree for 'pu' I pushed out
> > last night.
> 
> I wonder if I should have been the one fixing up the en/rebase-backend topic...
> 
> Also, with the new release and the review comments Phillip posted on
> the en/rebase-backend series, would you rather see me address those as
> additional patches on top of en/rebase-backend, or should we kick that
> topic out of next and have me send a full re-roll?  I'm not sure
> what'd be better and I don't mind going either direction...

For what it's worth, I had started to look into one of the bugs Jonathan Nieder reported[1] as a patch on top of en/rebase-backend topic. I'll keep an eye on this thread; if you're interested in rerolling the whole topic then it might be less time for you to identify the right place to call "post-commit" than it would be for me, plus less conflict resolution time.

[1]: https://lore.kernel.org/git/20200110231436.GA24315@google.com/ (bullet point 1)

 - Emily
Previous: Elijah NewrenNext: Elijah Newren
Message 2 of 3 in “en/rebase-backend (was Re: "rebase -ri" (was Re: Problems with ra/rebase-i-more-options - should we revert it?))”
  1. Elijah NewrenJan 14, 2020
  2. Emily ShafferJan 14, 2020
  3. Elijah NewrenJan 14, 2020

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.