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

Re: RFC -- making a plan for remainder of merge-ort

From
Elijah Newren <newren@gmail.com>
Date
Feb 3, 2021, 05:48 UTC
Message-ID
<CABPp-BHqk3UkauL-MmQ+JBJvhC6WRhJJM+yLvXiENZNn+CTw5w@mail.gmail.com>
In-Reply-To
<bae3726e-25e1-90e5-b0e3-5c2d0c4cd26a@gmail.com>
On Tue, Feb 2, 2021 at 3:33 AM Derrick Stolee <stolee@gmail.com> wrote:
Show 22 quoted lines
>
> On 2/1/2021 10:52 PM, Elijah Newren wrote:
> > Hi everyone,
> >
> > There will be ~11 more series (with about ~6-7 patches per series)
> > before merge-ort is complete.  Now that gitster/en/merge-ort-perf has
> > merged to next, I can start submitting the next series.  Some
> > questions before I do so, though:
> > > * What's the right rate to submit them to not overwhelm reviewers? One
> > per week?  I didn't get much feedback on this for the past series.
> > [One per week, assuming the git-2.32 cycle is 3 months long, would
> > mean finishing in about 3 months, i.e. just a few weeks before
> > git-2.32-rc0.]
>
> I promise to get back to reviewing with a faster turnaround soon.
>
> If these are smaller series (and ~6-7 patches per would be smaller)
> then I could see most of them stabilizing within a week. I think the
> biggest thing for dependent series is to allow one to stabilize
> before starting the next one. OF course, we can _think_ something is
> stable and then a contributor appears with insightful comments a week
> or more later.

Yeah, smaller on average, but there is a long one early on. The next eight series' patch counts are: 2, 3, 11, 7, 8, 7, 6, 7. I don't have ones beyond that ready quite yet.

Also, for the next nine series, each one will depend upon the previous one.
Show 9 quoted lines
> > * My focus for the next few series is on diffcore-rename.c, which will
> > also affect things other than merge-ort.  While each series is
> > self-contained, given that 2.31-rc0 is just over 3 weeks away I'm
> > wondering if it makes sense to hold my future diffcore-rename series
> > out of 2.31 and start merging them in the 2.32 cycle.  Thoughts?
>
> It might be fine to get the code under review, but ask Junio to
> delay merging into 'master' until shortly after release. This
> ensures that there is plenty of time to "simmer in CI."
Makes sense; I'll submit the first one.
Previous: Derrick Stolee
Message 3 of 3 in “RFC -- making a plan for remainder of merge-ort”
  1. Elijah NewrenFeb 2, 2021
  2. Derrick StoleeFeb 2, 2021
  3. Elijah NewrenFeb 3, 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.