Date: Tue, 20 Apr 2021 16:46:13 +0200 From: Mateusz Piotrowski <0mp@FreeBSD.org> To: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernando.apesteguia@gmail.com> Cc: Mathieu Arnold <mat@freebsd.org>, doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org Subject: Re: git: ceee1def00 - main - articles/committers-guide: Document change in MFH policy Message-ID: <e07043f8-a285-cfb2-af70-4c8b4d410f81@FreeBSD.org> In-Reply-To: <CAGwOe2YaUwnv%2BH79pGKendFBk6D=B10eOe8mpRTym8Zfxxb9AQ@mail.gmail.com> References: <202104201032.13KAWNFn016258@gitrepo.freebsd.org> <20210420122849.rh5v2kohzvkxs4uu@aching.in.mat.cc> <3252cd06-4140-0bc2-e958-983b4a2453c2@FreeBSD.org> <CAGwOe2YaUwnv%2BH79pGKendFBk6D=B10eOe8mpRTym8Zfxxb9AQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 20/04/2021 15:12, Fernando Apesteguía wrote: > On Tue, Apr 20, 2021 at 2:39 PM Mateusz Piotrowski <0mp@freebsd.org> wrote: >> On 20/04/2021 14:28, Mathieu Arnold wrote: >>> On Tue, Apr 20, 2021 at 10:32:23AM +0000, Mateusz Piotrowski wrote: >>>> The branch main has been updated by 0mp: >>>> >>>> URL: https://cgit.FreeBSD.org/doc/commit/?id=ceee1def00ac69f06b9d86b2fb1ff04bb6c84d48 >>>> >>>> commit ceee1def00ac69f06b9d86b2fb1ff04bb6c84d48 >>>> Author: Mateusz Piotrowski <0mp@FreeBSD.org> >>>> AuthorDate: 2021-04-20 10:14:58 +0000 >>>> Commit: Mateusz Piotrowski <0mp@FreeBSD.org> >>>> CommitDate: 2021-04-20 10:14:58 +0000 >>>> >>>> articles/committers-guide: Document change in MFH policy >>>> >>>> Merging commits into the quarterly branch no longer requires an explicit >>>> approval [1]. Let's remove outdated documentation and leave a note >>>> explaining that there is no need for an explicit approval to MFH. >>> Note that the MFH line should still be used to note intent. >> Hmm, true. It does make sense to leave MFH in the table of metadata fields for this use case. I'll >> bring back the MFH entry with an updated definition. > The template still says: > > # MFH: <Ports tree branch name. Request approval for merge.> > > Maybe something like "State your intention to merge this change" would > be more appropriate. Good point! Here are some reviews for the hooks if you are interested: https://reviews.freebsd.org/D29861 https://reviews.freebsd.org/D29860 https://reviews.freebsd.org/D29858
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e07043f8-a285-cfb2-af70-4c8b4d410f81>