Re: [PATCH 00/10] Xdiff cleanup part 3
- From
Ezekiel Newren <ezekielnewren@gmail.com>
- Date
- Mar 9, 2026, 19:06 UTC
- Message-ID
- <CAH=ZcbBVSqUG89n65MBpN+HMCmmjzmADGaVnuEJn_cYN0SYknw@mail.gmail.com>
- In-Reply-To
- <xmqqy0k4wogg.fsf@gitster.g>
On Fri, Mar 6, 2026 at 4:03 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 23 quoted lines
> > "Ezekiel Newren via GitGitGadget" <gitgitgadget@gmail.com> writes: > > > Patch series summary: > > > > * patch 1: Introduce the ivec type > > * patch 2: Create the function xdl_do_classic_diff() > > * patches 3-4: generic cleanup > > * patches 5-8: convert from dstart/dend (in xdfile_t) to > > delta_start/delta_end (in xdfenv_t) > > * patches 9-10: move xdl_cleanup_records(), and related, from xprepare.c to > > xdiffi.c > > Is this topic still viable? > > We had to stop merging this series to the integration branches as > another topic <cover.1769424529.git.phillip.wood@dunelm.org.uk> with > smaller footprint was making conflicting clean-up. Since the other > topic was merged at 5465d368 (Merge branch 'pw/xdiff-cleanups', > 2026-02-20) a few weeks ago, we may want to resurrect this topic by > rebasing on top of a more recent 'master' branch. > > Thanks.
I plan on rebasing on top of master with lots of changes. v2 will be quite different from v1.