From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2JwBOenaxWDLkwAAgWs5BA (envelope-from ) for ; Sun, 13 Jun 2021 12:16:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id qAK3NOnaxWAZUQAAB5/wlQ (envelope-from ) for ; Sun, 13 Jun 2021 10:16:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4580F274EF for ; Sun, 13 Jun 2021 12:16:09 +0200 (CEST) Received: from localhost ([::1]:49626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsNA0-0000x1-4i for larch@yhetil.org; Sun, 13 Jun 2021 06:16:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsN9w-0000w1-6M for guix-patches@gnu.org; Sun, 13 Jun 2021 06:16:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsN9v-0002CP-Ug for guix-patches@gnu.org; Sun, 13 Jun 2021 06:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsN9v-0002kQ-Rf for guix-patches@gnu.org; Sun, 13 Jun 2021 06:16:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48696] [PATCH v2 2/4] doc: Add "Addressing Issues" section. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Jun 2021 10:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48696 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48696@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines Received: via spool by 48696-submit@debbugs.gnu.org id=B48696.16235793559989 (code B ref 48696); Sun, 13 Jun 2021 10:16:03 +0000 Received: (at 48696) by debbugs.gnu.org; 13 Jun 2021 10:15:55 +0000 Received: from localhost ([127.0.0.1]:42690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsN9m-0002aY-Fe for submit@debbugs.gnu.org; Sun, 13 Jun 2021 06:15:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsN9j-0002SL-0B for 48696@debbugs.gnu.org; Sun, 13 Jun 2021 06:15:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38712) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsN9d-0001vG-Hf; Sun, 13 Jun 2021 06:15:45 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55286 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsN9d-0002w0-AL; Sun, 13 Jun 2021 06:15:45 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 13 Jun 2021 12:15:36 +0200 Message-Id: <20210613101538.10668-3-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210613101538.10668-1-ludo@gnu.org> References: <87lf7g7azx.fsf@gnu.org> <20210613101538.10668-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623579369; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=BwbspzhKXmCrl7oqepLPVNQHquODT8DqKrUojVWVIoY=; b=Vmyjz1hl5KM7kHZwd3BW8MWpr04yE9kC49K4LFz6lQ6XMi5JAiZFP9u0N6/0rFzt3QlPgX soM25NvEJ5P4qZCafgMsGgc+CNdBTi2i/gY2xwliK5WspujnhWMT4FTYTPt8+wZximzj28 j2G4RNzQ5Ic53LPgRDIR8bHQo1+YjtHk5uUXzSgDjGvAvbV7g7t1IErG7pl0hG4PeH1XuD O/7+VOqoXd3vMNCECLcq4uzXWrI13qKLKWuHVcfTlk7Zpme3X00qe4sXT6boTA9DJljgzo ukOFk2yb/Q9zdqu03jx4+IFsUx2zs1DV6e1s7RcneYufm7gdX8v/sqYcN5FaZg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623579369; a=rsa-sha256; cv=none; b=EzPWPSaYAv83m6hcBkPHMYU45bh+WzaBx8oIN5fWTamA8+ooerxTajVdaYA1yY4OhepzeL 7FuB0QnntscrHTdTZT8r2jN11/3Wr1GSG7/EAAUQNIY/7TMOCNrLpIWLF2e74YOzsnRMvs zAdvdx5rJ54PjBe7WB5w4+AnrvbLXQckf0I3cKKCi8mVJgluoEMrY60OTypKv5QtBgxgFV 6QeSsoghX6QkrD09KHbdjM4JurSVX8o0BhPSkn+xIKKNhQP9PGOdXnwQDyI8FYUMiuHsWn Z3QP6BTAVbV3Xtomg8oe5Gw/uPbxCZT+mPYg5YDL7OLGZU605XGwKhdWZV/tHA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.92 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4580F274EF X-Spam-Score: -1.92 X-Migadu-Scanner: scn1.migadu.com X-TUID: 8cV5DL70cWza * doc/contributing.texi (Addressing Mistakes): New section. Co-authored-by: Christopher Baines --- doc/contributing.texi | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/doc/contributing.texi b/doc/contributing.texi index 4ab489173b..00962be11e 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1419,6 +1419,45 @@ you're confident, it's OK to commit. That last part is subject to being adjusted, allowing individuals to commit directly on non-controversial changes on parts they’re familiar with. +@subsection Addressing Issues + +Peer review (@pxref{Submitting Patches}) and tools such as +@command{guix lint} (@pxref{Invoking guix lint}) and the test suite +(@pxref{Running the Test Suite}) should catch issues before they are +pushed. Yet, commits that ``break'' functionality might occasionally +go through. When that happens, there are two priorities: mitigating +the impact, and understanding what happened to reduce the chance of +similar incidents in the future. The responsibility for both these +things primarily lies with those involved, but like everything this is +a group effort. + +Some issues can directly affect all users---for instance because they +make @command{guix pull} fail or break core functionality, because they +break major packages (at build time or run time), or because they +introduce known security vulnerabilities. + +@cindex reverting commits +The people involved in authoring, reviewing, and pushing such +commit(s) should be at the forefront to mitigate their impact in a +timely fashion: by pushing a followup commit to fix it (if possible), +or by reverting it to leave time to come up with a proper fix, and by +communicating with other developers about the problem. + +If these persons are unavailable to address the issue in time, other +committers are entitled to revert the commit(s), explaining in the +commit log and on the mailing list what the problem was, with the goal +of leaving time to the original committer, reviewer(s), and author(s) +to propose a way forward. + +Once the problem has been dealt with, it is the responsibility of +those involved to make sure the situation is understood. If you are +working to understand what happened, focus on gathering information +and avoid assigning any blame. Do ask those involved to describe what +happened, do not ask them to explain the situation---this would +implicitly blame them, which is unhelpful. Accountability comes from +a consensus about the problem, learning from it and improving +processes so that it's less likely to reoccur. + @subsection Commit Revocation In order to reduce the possibility of mistakes, committers will have -- 2.32.0