Date: Tue, 20 Apr 2021 14:28:49 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Mateusz Piotrowski <0mp@freebsd.org> Cc: 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: <20210420122849.rh5v2kohzvkxs4uu@aching.in.mat.cc> In-Reply-To: <202104201032.13KAWNFn016258@gitrepo.freebsd.org> References: <202104201032.13KAWNFn016258@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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. > [1] https://svnweb.freebsd.org/ports?view=revision&revision=556626 > --- > .../en/articles/committers-guide/_index.adoc | 60 +--------------------- > 1 file changed, 1 insertion(+), 59 deletions(-) > > diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc > index 3dbc468fda..f0548fbce5 100644 > --- a/documentation/content/en/articles/committers-guide/_index.adoc > +++ b/documentation/content/en/articles/committers-guide/_index.adoc > @@ -2584,9 +2584,6 @@ Approved by: re (username) > |`MFC with:` > |If the commit should be merged together with a previous one in a single MFC commit (for example, where this commit corrects a bug in the previous change), specify the corresponding Git hash. > > -|`MFH:` > -|A ports quarterly branch name, to request approval for merge. > - > |`Relnotes:` > |If the change is a candidate for inclusion in the release notes for the next release from the branch, set to `yes`. > > @@ -3450,62 +3447,7 @@ For more information on how to merge commits to the quarterly branch, see <<port > [[ports-qa-misc-request-mfh]] > ==== What is the procedure to request authorization for merging a commit to the quarterly branch? > > -When doing the commit, add the branch name to the `MFH:` line, for example: > - > -[.programlisting] > -.... > -MFH: 2014Q1 > -.... > - > -It will automatically notify the {ports-secteam} and the {portmgr}. > -They will then decide if the commit can be merged and answer with the procedure. > - > -If the commit has already been made, send an email to the {ports-secteam} and the {portmgr} with the revision number and a small description of why the commit needs to be merged. > - > -[TIP] > -==== > -If the MFH is covered by a blanket approval, please explain why with a couple of words on the `MFH` line, so that the reviewing team can skip this commit and save time. > - > -For example: > - > -[.programlisting] > -.... > -MFH: 2014Q1 (runtime fix) > -MFH: 2014Q1 (browser blanket) > -.... > - > -The list of blanket approvals is available in <<ports-qa-blanket>>. > -==== > - > -[[ports-qa-blanket]] > -==== Are there any changes that can be merged without asking for approval? > - > -The following blanket approvals for merging to the quarterly branches are in effect: > - > -[NOTE] > -==== > -This blanket approval also applies to direct commits for ports that have been removed from `head`. > -==== > - > -[IMPORTANT] > -==== > -These fixes must be tested on the quarterly branch. > -==== > - > -* Fixes that do not result in a change in contents of the resulting package. For example: > -** [.filename]#pkg-descr#: `WWW`: URL updates (existing 404, moved or incorrect) > -Build, runtime or packaging fixes, if the quarterly branch version is currently broken. > -Missing dependencies (detected, linked against but not registered via `*_DEPENDS`). > -* Fixing link:{porters-handbook}#uses-shebangfix[shebangs], stripping installed libraries and binaries, and plist fixes. > -* Backport of security and reliability fixes which only result in `PORTREVISION` bumps and no changes to enabled features. for example, adding a patch fixing a buffer overflow. > -* Minor version changes that do nothing but fix security or crash-related issues. > -* Adding/fixing `CONFLICTS`. > -* Web Browsers, browser plugins, and their required dependencies. > - > -[IMPORTANT] > -==== > -Commits that are not covered by these blanket approvals always require explicit approval of either {ports-secteam} or {portmgr}. > -==== > +As of November 30, 2020, there is no need to seek explicit approval to commit to the quarterly branch. > > [[ports-qa-misc-commit-mfh]] > ==== What is the procedure for merging commits to the quarterly branch? > -- Mathieu Arnold [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmB+yPxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgLwShAAnVC0eR5wk+GAWm4LzlomiAlMfFlQjxDur6/il+xWhCL08lEHwPIs6Vwr vPoOteRE3x8i6ODeg4t9okOu3aEe9339ArdKlKihB8u/P9KtWjvVlzqdCAa5mvuL jLrUhkRmnyLNZ+auBo1DxHzxQL10mkZ2slLX7b3xK/DVH8Xe8g5IcOePNPsNQIFY teFArnNQi+wP56rSennaoFtO4ZABatT2x2bFs2FJY0nkZ/w4ySNrMr3CRPfbbUCw pt+dNDmpTSo4pcMw/Poq+Ph9mgVyidopRC33bw9Wr5UyL2+j/pgfrJP9g5Oy1lzE Xyj2B4EYo7T8QLuHBohDyXezLomQWMooK8ObdS9LCZbiOPLNaM61Y3dbkAVdELw5 r7gJM8I25AOOi+Gwurmm+BJxjbIr5miVUIaXA99Q0HIiDTbXOBvYrEsoiVyFnwUI qWwA/0HSN0udTmdB7+y/+l4UhndbsLl+7s722X/5WYIOXoEnFfzEBh8jvV6avYz7 Ih7ES+cpl+TAMN/JsbQUOqz4ixpWg30r04UyUxMgLpVi/PPYV4FW9NPryyGwZmqP 6WTOtiuqaaw8cAcm9WAwt6HJ+vfUSgQZXMW+4ZmLNwmaTF6as4zBf/GNizeYGFJf wIXKxUafVKaOnEfRxldaT7ohY2JBoxoIAq2N7iVr76xFcDNYkVo= =TDCH -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210420122849.rh5v2kohzvkxs4uu>