Thread (37 messages) 37 messages, 4 authors, 15d ago

Re: [PATCH 2/5] xdiff: replace mmbuffer_t with mmfile_t

flat view

From: D. Ben Knoble <hidden>
Date: 2026-09-29 11:08:34

On Tue, Sep 29, 2026 at 2:57 AM Jeff King [off-list ref] wrote:
Our import of xdiff has two identical buffer structures: mmfile_t and
mmbuffer_t. In upstream xdiff these were actually different, but the
import in 3443546f6e (Use a *real* built-in diff generator, 2006-03-24)
simplified mmfile_t to a simple buffer.
[snip]
I guess this step might be controversial, but I hope not. I think the
ship has long sailed on trying to pull "upstream" changes from xdiff
(there haven't been any, and we've hacked it up quite a bit already).
I think for a while Vim has also pulled in xdiff from Git (since our
copy is actively maintained), but I might have that wrong. I think
they decided to stop doing so after the Rust bits merged?

At any rate, I don't think that should be a strong (or even weak)
objection to consolidating our code. Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help