Date: Sun, 1 Mar 2026 10:07:29 -0800 From: Enji Cooper <yaneurabeya@gmail.com> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup Message-ID: <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> In-Reply-To: <86tsuzojnj.fsf@ltc.des.dev>
index | next in thread | previous in thread | raw e-mail
> On Mar 1, 2026, at 03:48, Dag-Erling Smørgrav <des@freebsd.org> wrote: > > "Enji Cooper (yaneurabeya)" <yaneurabeya@gmail.com> writes: >> It looks like the diff3(1) code came from OpenBSD (at one point in >> time). Are there any plans to converge/merge with that codebase in the >> future? > > Theirs doesn't work. Ours does, and that took a lot of work. They're > welcome to merge our improvements. Thank you very much for the reply, the explanation, and all of the hard work making core utilities like this function. I wasn’t aware that their version didn’t really work; the RCS Id in the file was ancient, hence the question about reconciling with OpenBSD (I thought there was a chance that we could maybe leverage some of their code/fixes in the future to reduce maintenance effort). About the sysexits change: is there a reason why it was made? I’m asking because another recent change made by an external contributor introduced sysexits use, whereas this change removed it. I want to understand more of your thought process and which way userspace code should be moving in for the sake of consistency, so I can follow similar rules as needed, enforce them in reviews, etc. I don’t want to clash with other developers unnecessarily (I remember sysexits being a point of contention with some developers in the past). Cheers! -Enjihome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5AF72509-9232-4B17-853D-A12D9862C422>