From nobody Sun Mar 1 18:07:29 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fP95J4GlDz6TRWV for ; Sun, 01 Mar 2026 18:07:32 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP95J260tz3lL3 for ; Sun, 01 Mar 2026 18:07:32 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-824c9da9928so2088053b3a.3 for ; Sun, 01 Mar 2026 10:07:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772388450; x=1772993250; darn=freebsd.org; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=SFZXgfDPp2goYleTOPmGRGo3YmCTEYJxbhm00F+yfYg=; b=R0xr/tT1SpnOFzeJ9Egqjv8/ub9be3sMIvOvFhCgDYcDmL/5NnFOF/a/xHnbu1+H5G kEzmd8z9AzKtZOZAc+SejgDYfGcLPT3s8p1P2sD0jOeHDw349BljGIxPeu3+lT+p6gNb GyS4Yw3teUab0OW5qYwi26noeVXr0IuPta0Bbcli0CDlnFDnl+VQLTntME9sdDDW2/EN 4z2CF+ifrQKLncZeReaqOqmdIE4B3ylh9cSmAVT0cFSvOTzXuLkC/C3qCKAFv8rNuBHx ZiVrFW/RpUTqBpQFHt0xAYdw5sFxgi5jshhAvRgPcMH9g/kkTbmNkSobn1j/jrT19vx8 QvFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772388450; x=1772993250; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SFZXgfDPp2goYleTOPmGRGo3YmCTEYJxbhm00F+yfYg=; b=IBMsYysIgSRSW5NqyuMjhFWDGfSipoE8Z3oouaLgKZ3ChzDuWd2sKuDH8Va/ibSwh3 pzFy8jdAFUKa3vcyi+QjBUnOH+WhqlHetkWFlB/7CEnc5anNWDlyMGWgEijYJlaPACTM PsR3EHiDyaCLq+fwYnEfL4zVq8BnlqzWD4Q2V/2xxtsZr3wDdwi5NV6IG+VGJm8JVRFV x4C6pKPyXc3wZWlM16/2Yf8HKyOAA/LQsuVWcQVDxLf5zMFFnQDhrgJQS85fuWctyQOU YqBV0nn51bLKDKXKpShEhgdhWCOVveBMDp2SafPTgoGZY/3LGaSaIadsco5SSh1KJzv4 l2rQ== X-Forwarded-Encrypted: i=1; AJvYcCVRAKvYECOCS9981HID3WrW1BYk3n2nb/BLhoMH1PR0EOf9NWX1xDBFymdsqiSSOWp5DSVCwUU+wbYoiqDNWZQ4AgzROA==@freebsd.org X-Gm-Message-State: AOJu0YwWc/I8E1hJzcEUdgf+aLXVyKl/m9Fe00BvaoWRsPsyJ3/Ewevs nOtaVwBd5yU35zYbsHVlsF76+z/DrWSA58Hh60KX1pTw0AcVKqVFcbiG X-Gm-Gg: ATEYQzzJC48tO+o3boadI+OisMcZAO0/S3/z4EVur88oTK4q05iPfHoCu4KIZaQuP7t UxCpNA3GUqX9cYwy3xy9UfRDxhQXHNlVCNONjeVMjLhv6sUqY/IAVRGfwtD9Cq/6bptO0w3wWCX tYEhK+yh3KLr0Kr3VHrXApc3KdCllRYUHjFMfUhbsFuSLWybAgxMVcTe4/Z2BwI2mIcFkmU7HnG Lb5IhetkgdUM3nxnKBLqjpOUQJb4t6oKGLHZ8NtNP0Oikv+Q7kBJ23MgUl3e3nXnh+cJuu8K7KN 6z3aSfQLOyKP+NCXSF3P7V3L6B8ZeJlSIYDXg+3O+uHg7Lq6iq+bhGDyDaI61sk5BBR67b8dN0l t4QyGIwlscWacs7NnSze22LcxdptMlqXZKvQulMrJgxNJkPChHWXpNPgBv1auGsE5EzcFy2Q18h 3/KKnY+5673flnYDerRf1eiu+1EEujCfkWu/AjdgGHSFYFjA== X-Received: by 2002:a05:6a00:3e1e:b0:823:f74:662f with SMTP id d2e1a72fcca58-8274da093aemr8620723b3a.51.1772388450032; Sun, 01 Mar 2026 10:07:30 -0800 (PST) Received: from smtpclient.apple ([162.118.1.182]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d8805esm11308424b3a.16.2026.03.01.10.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2026 10:07:29 -0800 (PST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Enji Cooper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (1.0) Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup Date: Sun, 1 Mar 2026 10:07:29 -0800 Message-Id: <5AF72509-9232-4B17-853D-A12D9862C422@gmail.com> References: <86tsuzojnj.fsf@ltc.des.dev> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <86tsuzojnj.fsf@ltc.des.dev> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: iPhone Mail (23D127) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fP95J260tz3lL3 X-Spamd-Bar: ---- > On Mar 1, 2026, at 03:48, Dag-Erling Sm=C3=B8rgrav wrote= : >=20 > =EF=BB=BF"Enji Cooper (yaneurabeya)" 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? >=20 > 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=E2=80=99t aware that their version didn=E2=80=99t really work; the RC= S Id in the file was ancient, hence the question about reconciling with Open= BSD (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=E2=80=99m as= king because another recent change made by an external contributor introduce= d sysexits use, whereas this change removed it. I want to understand more of your thought process and which way userspace co= de should be moving in for the sake of consistency, so I can follow similar r= ules as needed, enforce them in reviews, etc. I don=E2=80=99t want to clash w= ith other developers unnecessarily (I remember sysexits being a point of con= tention with some developers in the past). Cheers! -Enji=