Date: Fri, 17 Oct 2025 10:03:53 -0700 From: Gleb Smirnoff <glebius@freebsd.org> To: "Enji Cooper (yaneurabeya)" <yaneurabeya@gmail.com> Cc: Alexander Leidinger <Alexander@leidinger.net>, Rick Macklem <rick.macklem@gmail.com>, "David E. O'Brien" <obrien@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 0050289464fa - main - style(9): white space after ; and around binary operators Message-ID: <aPJ2-ffCkWNu8vHV@cell.glebi.us> In-Reply-To: <AA044313-BA72-44D8-9AA4-CADAD7A11017@gmail.com> References: <202510162205.59GM5ZvD042942@gitrepo.freebsd.org> <CAM5tNy68Gpj0qKV2HyRQ5t1PqchXtfi5bh53QK874aGM9WiEPw@mail.gmail.com> <CAM5tNy4pCN6nUbcr9W8-%2B2MLaULDMpK_DR%2B9Yye4t6aPvrbK9Q@mail.gmail.com> <16835444882475995d82a23078996276@Leidinger.net> <AA044313-BA72-44D8-9AA4-CADAD7A11017@gmail.com>
index | next in thread | previous in thread | raw e-mail
On Fri, Oct 17, 2025 at 12:38:20AM -0700, Enji Cooper (yaneurabeya) wrote: E> I’m not sure about the percentage Rick mentioned, but I think Mark’s comment about avoiding merge conflicts is a key point (for FreeBSD as well as downstream consumers of FreeBSD. E> Unnecessary churn can also make reconciling changes with other sources, e.g., NetBSD, OpenBSD, more difficult for little to no gain. I will emphasize that such a sweeping commit that adds extra churn to main right when re@ is working on .0 release is not helpful at all. Right now re@ and anyone else who cares about 15.0-RELEASE would prefer no extra divergence betweem main and stable/15. If I a commit a bug fix right now around same lines that were touched by this commit, this bug fix will not be cherry-pickable to stable/15 and releng/15.0. P.S. I'm in favor of sweeping stylistic changes, but few weeks before branching a stable, not few weeks after. -- Gleb Smirnoffhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aPJ2-ffCkWNu8vHV>