From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 18 12:43:41 2024 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 To: guix-patches@gnu.org Subject: [PATCH] doc: contributing: Add guidance on reverting commits. 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 X-Debbugs-Cc: Ludovic Courtès , Maxim Cournoyer 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 18 20:53:11 2024 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 To: Christopher Baines Subject: Re: [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits. 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74950 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 74950@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 03 16:28:25 2025 Received: (at 74950-done) by debbugs.gnu.org; 3 Jan 2025 21:28:25 +0000 Received: from localhost ([127.0.0.1]:52434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTpDV-00035j-4L for submit@debbugs.gnu.org; Fri, 03 Jan 2025 16:28:25 -0500 Received: from mira.cbaines.net ([212.71.252.8]:44116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tTpDQ-00035W-U1 for 74950-done@debbugs.gnu.org; Fri, 03 Jan 2025 16:28:23 -0500 Received: from localhost (unknown [IPv6:2a02:6b67:e390:8b00::1ce5]) by mira.cbaines.net (Postfix) with ESMTPSA id 0C38E27BBE2; Fri, 3 Jan 2025 21:28:18 +0000 (GMT) Received: from fang (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 64571a3b; Fri, 3 Jan 2025 21:28:17 +0000 (UTC) From: Christopher Baines To: Maxim Cournoyer Subject: Re: [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits. In-Reply-To: <87cyhoo2wy.fsf@gmail.com> (Maxim Cournoyer's message of "Thu, 19 Dec 2024 10:51:57 +0900") References: <105caea83cc475bd2b89acf6be9b1ad2f2daf227.1734543812.git.mail@cbaines.net> <87cyhoo2wy.fsf@gmail.com> Date: Fri, 03 Jan 2025 21:28:15 +0000 Message-ID: <87ttaf8u4w.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74950-done Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 74950-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Maxim Cournoyer writes: > 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 commi= ts. >> >> 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. >>=20=20 >> +@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 for taking a look, I've pushed this to master as 061c5820d1bacde60782b3d82ffb9770454dc658. And yeah, I agree it would be good to have automation/process to prevent these issues, this is just a stopgap measure. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmd4Vm9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcweBAAjMfwJO7IYDlED5Y6rdcwkfKSgq8Fo6Sh D7/QeB5hOMhTlCCl8tymWV+0X5D92vVYs/bMy1Oj744lflrXSmuaCYmCBHf3GPK+ STQNFDA023F8iUFFAdMh7GQ+JIQq3UGv5vYTmmoQrla3BFnC5HEETRBB/ibj/+Hr TEW/nZZx789AtoOP6LnkKQ51/OJ/JiLcBB2hU60MPzGH+KQmn3ZPobvk3b4rWPSv hgz6TuLiQsqwDIq4uCYX7VPHtoKSfI0m6mrp2FmIpbIEp+HILx1seNDfnq7Vc2w1 kS85Cwb67TNpTwBHPQXbcI3G3quqBIGvcSXK3w4h9LDdYiNLBcycukUI3y7jEvEm swAitbTREIioVqb0sWkS1A9mK2RI9jmx9/cQtYGK8wfjCGOeeW5ZZT/4fcd3u7vm /WabnKYTUlABO5FbY3pC1+my736ORy2hTKUiGM0nhHF4V4VmCXUBQ5L2A9nGPdr2 UtKky2ciDkle7XS033amXnZro5MPbX+wYLzBMCfm4owS3LCLK4r2/oAYg1leX1h2 oKgWLNOXPP7Kbdajlr+z4qPLbHEWbKQ7K0xySsrTZjNoZBwTvQFwm+56Suk5/nMR 2jQH5GsAKKFwT8UnpS/od6WcnFg6E1/8qK/PTFPNJFTPlyFG03d+pqnDNg27ZJCn fKkJGn+3Tnw= =nnLk -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Jun 19 14:26:36 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 01 Feb 2025 12:24:12 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator