From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yGYbAe0JY2cJ2gAAe85BDQ:P1 (envelope-from ) for ; Wed, 18 Dec 2024 17:44:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id yGYbAe0JY2cJ2gAAe85BDQ (envelope-from ) for ; Wed, 18 Dec 2024 18:44:13 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LvExuWhM; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734543853; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=cHuiB35d9IAIfw/FuPFPBV5CXhUjooqu50nJmJGibqw=; b=QkmMwccXRxEdd4/QAo74JH4ux26ka/eY4pvCj9Iy0pBG8rDNnVgYmZsl4Nl1cVHFzOufnc de0ddSwfJiedfVCgqWbkPO34l7CfpfNY+Jy8FSnrqYLG0RA/ZrSXDO7hKfyElHv5HUHhW/ AFzQRaakN+b29UDDsjvzI0A1Ta4++3pXqoI38y5XPr1+CrlXV0kaLsIOuOfJy/1QTMp06b 1GzoiVGj2xC3cAC3HQP1IfwU+J1LUr8XuzIOAAmCInt7r5yA17whUKASfqgM4z7J5oA779 LJBZxPljbJgJYg6R81hFyuLuaoLL6VHb21fLGU8M5eng1dv1j86+7QD18JMang== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734543853; a=rsa-sha256; cv=none; b=DLq3aNRTuZouQReKu6sbd2sxeEcQ0Z1igu30nGqh1olYQzUI/16fWvQ0MbKDKHbS5zc7cq eWl862C1kN6DasGv6cuZ48fvBRyuAr/oX3PjcOn1CZsgcU4RTTUqF8eYafF5ajuS8XnxYq 8EfrV+20waongAlygkcO3akhToQvl3XKrPOJdhKKGXj9hzZf1cMVmto/Xg7SkEM9BoSqNz AHNSC8c6dacbp8fq/Z/5/UJ+m5gQVhCcRQN16L01cH2FxoehVSxwlcRpJWv7ttxlmkITjc V/EbXqdgdVIqERqWI7O2QvP4myzI3R46MGouH4aIbHXAsDU/kV6TLMZHRcL2sA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LvExuWhM; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" 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 902F1830C6 for ; Wed, 18 Dec 2024 18:44:11 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNy5d-0002Da-7P; Wed, 18 Dec 2024 12:44:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNy5b-00027c-Es for guix-patches@gnu.org; Wed, 18 Dec 2024 12:44:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tNy5b-0007Wb-6R; Wed, 18 Dec 2024 12:44:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=cHuiB35d9IAIfw/FuPFPBV5CXhUjooqu50nJmJGibqw=; b=LvExuWhMw9JLv9Icohc5Jp21b8vMG2uSrnfly3x+oK2bZsHXsFaRIzwjqNVj2EmZ8n5YVD6gXID+LrLojNA0+UA15o9VCOQ3PyvhxjQJhB1neqTPswJlsWwU06V6Jl4XZof0VESplzd8KhIaJzI7geoTKeGqDEVg2dk41+2qyMlO5t8BZFlm0RXnyrMj4G/5aqQrpmtgjttsaNlKl1zRtJGdVARjuOPVjE7y3Z6hu4SdG5SOeRgYUIwKDj1b0hvwaaztY60RbBTxd/56PbpyYRvfcAck3nbPSVkmAkSWu+j5prhG+axQEDnSzFBwZz29tzLlJ19Q3OifHg4CUpQ5Qg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNy5a-0008CW-ON; Wed, 18 Dec 2024 12:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 18 Dec 2024 17:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74950 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74950@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.173454382231472 (code B ref -1); Wed, 18 Dec 2024 17:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Dec 2024 17:43:42 +0000 Received: from localhost ([127.0.0.1]:35867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNy5F-0008BY-JA for submit@debbugs.gnu.org; Wed, 18 Dec 2024 12:43:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:37388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNy5D-0008BO-Cn for submit@debbugs.gnu.org; Wed, 18 Dec 2024 12:43:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNy5D-0001ju-6Q for guix-patches@gnu.org; Wed, 18 Dec 2024 12:43:39 -0500 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNy5B-0007UQ-Fz for guix-patches@gnu.org; Wed, 18 Dec 2024 12:43:38 -0500 Received: from localhost (unknown [IPv6:2a02:6b67:e390:8b00::129c]) by mira.cbaines.net (Postfix) with ESMTPSA id 6CCB527BBE2 for ; Wed, 18 Dec 2024 17:43:33 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d2bd0f84 for ; Wed, 18 Dec 2024 17:43:33 +0000 (UTC) From: Christopher Baines Date: Wed, 18 Dec 2024 17:43:32 +0000 Message-ID: <105caea83cc475bd2b89acf6be9b1ad2f2daf227.1734543812.git.mail@cbaines.net> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -7.17 X-Spam-Score: -7.17 X-Migadu-Queue-Id: 902F1830C6 X-TUID: eQ2ajTULrRmV Particularly to cover the case where things might need to happen with the build farms if changes are reverted. * doc/contributing.texi (Commit Access): Add guidance on reverting commits. Change-Id: Iba320b76b0927b693c75054b5473a50bdd77c7ee --- doc/contributing.texi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/contributing.texi b/doc/contributing.texi index d4784de452..c94ae940fa 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -2945,6 +2945,20 @@ Commit Access a consensus about the problem, learning from it and improving processes so that it's less likely to reoccur. +@subsubsection Reverting commits + +Like normal commits, the commit message should state why the changes are +being made, which in this case would be why the commits are being +reverted. + +If the changes are being reverted because they led to excessive number +of packages being affected, then a decision should be made whether to +allow the build farms to build the changes, or whether to avoid +this. For the bordeaux build farm, commits can be ignored by adding them +to the @code{ignore-commits} list in the +@code{build-from-guix-data-service} record, found in the bayfront +machine configuration. + @subsection Commit Revocation In order to reduce the possibility of mistakes, committers will have base-commit: 2185b5ad3d252774ae633a90e03d34cc24b95c38 -- 2.46.0