Date: Fri, 8 Nov 2019 15:15:41 +0000 From: Glen Barber <gjb@freebsd.org> To: Mark Johnston <markj@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r350089 - head Message-ID: <20191108151541.GU5599@FreeBSD.org> In-Reply-To: <201907171909.x6HJ96Tu082986@repo.freebsd.org> References: <201907171909.x6HJ96Tu082986@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--oGy11dVowAZA6eXT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 17, 2019 at 07:09:06PM +0000, Mark Johnston wrote: > Author: markj > Date: Wed Jul 17 19:09:05 2019 > New Revision: 350089 > URL: https://svnweb.freebsd.org/changeset/base/350089 >=20 > Log: > Add an initial RELNOTES file. > =20 > The intent is to provide a convenient location to document changes > that are relevant to users of binary FreeBSD distributions, in contrast > with UPDATING, which exists to document caveats for users who build > FreeBSD from source. > =20 > This complements the "Relnotes:" tag in commit messages by providing a > place to document the change in more detail, or in case a "Relnotes:" > tag was accidentally omitted. In particular, "Relnotes:" should be > used if you do not intend to document the change in RELNOTES for some > reason. > =20 > Changes to the file should not be MFCed. For now the file will exist > only in head, but may be updated via direct commits to stable branches > depending on how things go. > =20 I had to go look at the original thread to remind myself about this, but regarding not MFCing changes from head to stable branches, I think there may have been some confusion in the discussion. By "changes should not be MFCed", at least based on my recollection of how the conversation was going, I (at least) meant "not MFCed, but committed as a direct commit to stable branches." In other words, merging the RELNOTES change from head to stable/X does not really make sense, as the revision numbers will have changed, and would inevitably cause merge conflicts. Now that 12.1 is out, maybe we can expand the idea of this file into stable/12 and even stable/11. One additional idea that came to mind is with the formatting for stable branches. For example, in head, there is: rNNNNNN: The foo(8) utility was added. For stable branches, I would propose the format of: rNNNNNM, MFC of rNNNNNN: The foo(8) utility was added. Thoughts? Glen --oGy11dVowAZA6eXT Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAl3Fhp0ACgkQAxRYpUeP 4pPozw//ZwQ0CIkxoRyhkmuJlu6cWcvYG8FSgLZsG08UNJmV3BQ58qF2yJQFV/N0 UeBW/60BrhDn3WRf3LhtG/ZKoIFJEhnWvgShdyMBv4iSV6oYg65ZIbnleLoflAf5 ktINUsgbyq/X+DbcdEGAFXrL03IFukIkxmAKDV4kf4FSJ9ywyPTBfyynhKxB5Vpy 3s+5K7IJQlWVxmCmSOtGoE3IKDMofKQbvRJZL6i13ViBQlu5qMJimzuQkDLBoXX5 SCysNlzumzH2beJM9JsBE5YgxPG4ISkjJ3uhi3HxudNT7tMYuu+W09il2z9zneQ0 uEx3yqw/rA2ikuRq5H9ck80oFdlL+af3z/olhodgTPCfSEqAY5ZWVgLTxic3y5Ym I3y4vNeEIwZx1B1kQRIdyDOFOvxIIQe3qle9QCyLKKruptxJahN8Z3N0VF3pedPp i+UIujwtF4NGNHjtjBgDOi1+by6b+EwUuv5r2yhV3usnuZQXjSb00v9VNNsuXNHb 6alUlR2ymX/OT8lxEozrFfNOmvdleJZNmodpK2L3HTeWS1lStISixMAOPu2NDVmX s3BWfevCGqwVQSAwNDsq7WDR1jan4QK4ocfav8Y91ihokkF2uZbbePzKg5Yegli4 S79Qa2knx23Tx6Ipicqj1leDZzD9BgWXSacS24ZnoO7QI8GB/kg= =EMF7 -----END PGP SIGNATURE----- --oGy11dVowAZA6eXT--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191108151541.GU5599>