From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yFi4A8V8Y2cYsAAA62LTzQ:P1 (envelope-from ) for ; Thu, 19 Dec 2024 01:54:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id yFi4A8V8Y2cYsAAA62LTzQ (envelope-from ) for ; Thu, 19 Dec 2024 02:54: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=IWXiSBOI; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=SiqjWlGE; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734573252; 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: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: dkim-signature; bh=mgOKDscMHkg7YYG2bvw0+UYqffI9kQjXUXQ9Ek4gwdY=; b=rFgxJ1RqVsqCPQV+sgxWY5m3A5zNNEMlO7W8+dAxnhdThnQhHrJDuOqZOMaPxAIjdAGPsK GXi1wVf9w3Vhlsj1N4gUywwSx/KL6agpmzpuEDqdkQCBF598vCqLyqNm/9zNO1wIUApEW3 fE34wOqsW9TJPjYXIdwslDMjB9uz6D01ODZblGYAr+/TRkb1qdJIMIZkTUVpHm5zwXLFPT 4iuWABT/xIsAhMNeLNMzNMDw4K3zAvn7LmDGe1PILvt4UcEC/42x+Ms0l4zeSeBSONJKe3 OdtKgrg4uw1TgX4PaHHedBPXVNHJ2qf9AXy3RBkKMwOYf+qH12ZY4InlI6Ia6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734573252; a=rsa-sha256; cv=none; b=kzEPP+K62Zpi4WVqnK0pnQ1jfOVMmSuay+ljZqPNxXAfnCOrs6y4G7BhqVFRsc/MGhFhtE 5Qx6bI4yAEpyqGAVI0saqN2+KEw27qNzqRlEaIJsCnVTLXBaxFz0newe4Sz290r0zXyF27 mC/Qu6cHd4bptp2so2Am7CZQ/uaqGwKYnDQSko7ba29sy5ZWwkO4dueEWnuDhrO5bFBe4o 5rpmSzCE3Momkpso489iNIdiM1i8/FGszNvGt5gtlVqkYcxypIfo0vZ51A41WU29semm0L Eue4yO8iI3ukGOv/Fy6afNRSq/KyAaXPukMlVvhSzq4iLpKs4Pc76iMnW7S6ZQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=IWXiSBOI; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=SiqjWlGE; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) 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 9463383032 for ; Thu, 19 Dec 2024 02:54:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tO5jp-0002Ay-Ls; Wed, 18 Dec 2024 20:54: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 1tO5jo-0002Ad-C1 for guix-patches@gnu.org; Wed, 18 Dec 2024 20:54:04 -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 1tO5jo-0001nA-38 for guix-patches@gnu.org; Wed, 18 Dec 2024 20:54:04 -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:References:In-Reply-To:From:To:Subject; bh=mgOKDscMHkg7YYG2bvw0+UYqffI9kQjXUXQ9Ek4gwdY=; b=IWXiSBOI1MLjaBmdo+AtnrTTPITTxJJDGAxJnIvGgEu+KqEgPGatsYchV+SVyWyA/JkIgTkSEfpyaekY3ibfFRvLLRNyxuycV8u5lsTR/dRgaWtgLtMOyNRJ2JxRnQRokXTXaeiwB4F62iV9nVIGoftLbUJWqgyVZuygxDxj6d8UhcubwP3Jz8OYQ+uLZNEcEoE9771SC1ubsCGiqHaI/3gI96dV2mwiCfAA+WwP/3T50eMlzglJb892EvW6fUILaIiS8IuPPOrErqRvECdSsYxlog2ri0CDvEVpo2u+orh4kTuLEvqokz7BO8PRYkKrgYm4sJfYNM68YDbFKuta0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tO5jm-0006rq-K0 for guix-patches@gnu.org; Wed, 18 Dec 2024 20:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 01:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74950 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 74950@debbugs.gnu.org Received: via spool by 74950-submit@debbugs.gnu.org id=B74950.173457319126302 (code B ref 74950); Thu, 19 Dec 2024 01:54:02 +0000 Received: (at 74950) by debbugs.gnu.org; 19 Dec 2024 01:53:11 +0000 Received: from localhost ([127.0.0.1]:36732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tO5ix-0006q9-4c for submit@debbugs.gnu.org; Wed, 18 Dec 2024 20:53:11 -0500 Received: from mail-pl1-f176.google.com ([209.85.214.176]:45427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tO5iu-0006pz-94 for 74950@debbugs.gnu.org; Wed, 18 Dec 2024 20:53:08 -0500 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2164b1f05caso2535475ad.3 for <74950@debbugs.gnu.org>; Wed, 18 Dec 2024 17:53:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734573127; x=1735177927; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=mgOKDscMHkg7YYG2bvw0+UYqffI9kQjXUXQ9Ek4gwdY=; b=SiqjWlGE+xsVKESDmEmNpQYCJa8g9ITVtNexen7LlvPhVVs13vSboaA0IoytSOWBPK 2YvIZfSs29w9ASOn6hH8CocsFr+FK1desTmfKDbwVL7G7hNPEDrNeb80nrQ3XCnyyCHU Q3d56Ap7pOs6+RrjwjO5N9Cvq65YNx2FwKCHcwnDg++z4XqtbDpTRBLFlJyLlIZdJzM2 z4dv4SmJ7AGzIMgpYmxaGsLwycAruIEpWXMoRqCJxh6QlYjjRkf84vCZzJTxy0XLbvCU kixaWFIGWawWnf0Yc48EJ1u4XjXzcZw3rgOVOJyw1vQju8OmkBx9OeToMSrYghFVgHyf lKmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734573127; x=1735177927; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mgOKDscMHkg7YYG2bvw0+UYqffI9kQjXUXQ9Ek4gwdY=; b=Fa+x8aqp3WkycirkwlpHxmx7OCGt+6pL+b0mX2aUg/Bqs193iCRIEThhGPu7mAj2BI nHuk3UH1y/bdEecsJ7Fk812TrJoLA1/1Zru3J32+nWfo97vDXgNXtxfiCP+NU5OQjPug HhAJa3EhFJCSKpdmJqZtnQrUr1CCP+kNsVjwhQOoOXYcIYTQAv/FZbu1ehkI0nxiK6gl CmrWGc+csir9Z+BgF9slzCfFn2znMZBGjwq14l3BtbBM2fKsWSA+Lhc9+YWFupZr0rjP GsSMmyZyJmn3NqiidDmo/SMI//Z5ChTHuP0qInTbiBJHSSQyH+v74lwllrhChPn2Ow6h 16ww== X-Gm-Message-State: AOJu0YwZlZsnrHpDWn9ixqwAlKo2+iFmNrEqZWCINrGL2Ma8gMinDp2O PzMHXomiScj9AgpLkdx56/H2pdKOxI1Hgxy2HHYcHPhFQrRNfDoXna20dZTNqlI= X-Gm-Gg: ASbGncugVmp/sPmP9PLM8dtGhwX9Kl8t9mVUEwF3jcs3EdqS480RrFJ5UMRPA3yPEZt rCd46sIXAJzyM98kR+F22pinEL8SaiG+bBKFbW/4OnpH+Q4ruG9W48nvZea0fRVtP/EHBiqnP+s rhDt4mYhxAvyB6Hz7Lv/s4xO3ASredMGC90+zZF9Wz5oCBDPDtnwfa/PepoZn0AOtv00Y0pnZv4 qZ2NuaYb6trKlX0nWDpiP+6IcGdfdD0Ap8IGGsMqF/p3gt2aaElKQ== X-Google-Smtp-Source: AGHT+IGFY7RGy5fYF3Hs7NcLCFz/y7Eknrch/gRauFLqxIjc0YT6OLD1PdUPRMG5fAi1Yj8J77sazg== X-Received: by 2002:a17:903:94e:b0:216:46f4:7e30 with SMTP id d9443c01a7336-218d724d319mr78564405ad.43.1734573127297; Wed, 18 Dec 2024 17:52:07 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9cde66sm1865115ad.145.2024.12.18.17.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 17:52:06 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <105caea83cc475bd2b89acf6be9b1ad2f2daf227.1734543812.git.mail@cbaines.net> (Christopher Baines's message of "Wed, 18 Dec 2024 17:43:32 +0000") References: <105caea83cc475bd2b89acf6be9b1ad2f2daf227.1734543812.git.mail@cbaines.net> Date: Thu, 19 Dec 2024 10:51:57 +0900 Message-ID: <87cyhoo2wy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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: mx11.migadu.com X-Migadu-Spam-Score: -3.67 X-Spam-Score: -3.67 X-Migadu-Queue-Id: 9463383032 X-TUID: fg+lGU70QSxW Hi Christopher, Christopher Baines writes: > 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. > + It makes sense to me, but note that I'm increasingly weary of adding more to this already lengthy section. It'll be nice when we finally have something sitting between us and the git server to automate checks such as 'oh, this rebuilds too much, sorry, you'll need to create a feature branch' or 'oops, the test suite failed', etc. -- Thanks, Maxim