GNU bug report logs - #74950
[PATCH] doc: contributing: Add guidance on reverting commits.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74950 in the body.
You can then email your comments to 74950 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] doc: contributing: Add guidance on reverting commits.
Date: Wed, 18 Dec 2024 17:43:32 +0000

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

Message #8 received at 74950 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Christopher Baines <mail <at> cbaines.net>
Cc: Ludovic Courtès <ludo <at> gnu.org>, 74950 <at> debbugs.gnu.org
Subject: Re: [bug#74950] [PATCH] doc: contributing: Add guidance on
 reverting commits.
Date: Thu, 19 Dec 2024 10:51:57 +0900

Hi Christopher,

Christopher Baines <mail <at> cbaines.net> 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

Message #13 received at 74950-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: Ludovic Courtès <ludo <at> gnu.org>, 74950-done <at> debbugs.gnu.org
Subject: Re: [bug#74950] [PATCH] doc: contributing: Add guidance on
 reverting commits.
Date: Fri, 03 Jan 2025 21:28:15 +0000

[Message part 1 (text/plain, inline)]

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> Christopher Baines <mail <at> cbaines.net> 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 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.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.