From owner-dev-commits-doc-all@freebsd.org Tue Apr 20 10:32:23 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 97CFB5EFDB9 for ; Tue, 20 Apr 2021 10:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPg3q3yCkz4YyB; Tue, 20 Apr 2021 10:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7ABED11342; Tue, 20 Apr 2021 10:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KAWNaQ016259; Tue, 20 Apr 2021 10:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KAWNFn016258; Tue, 20 Apr 2021 10:32:23 GMT (envelope-from git) Date: Tue, 20 Apr 2021 10:32:23 GMT Message-Id: <202104201032.13KAWNFn016258@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: ceee1def00 - main - articles/committers-guide: Document change in MFH policy MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ceee1def00ac69f06b9d86b2fb1ff04bb6c84d48 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 10:32:23 -0000 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. [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 <>. -==== - -[[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?