From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Christopher Baines <mail@cbaines.net>
Cc: "Ludovic Courtès" <ludo@gnu.org>, 74950@debbugs.gnu.org
Subject: [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits.
Date: Thu, 19 Dec 2024 10:51:57 +0900 [thread overview]
Message-ID: <87cyhoo2wy.fsf@gmail.com> (raw)
In-Reply-To: <105caea83cc475bd2b89acf6be9b1ad2f2daf227.1734543812.git.mail@cbaines.net> (Christopher Baines's message of "Wed, 18 Dec 2024 17:43:32 +0000")
Hi Christopher,
Christopher Baines <mail@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
prev parent reply other threads:[~2024-12-19 1:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-18 17:43 [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits Christopher Baines
2024-12-19 1:51 ` Maxim Cournoyer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87cyhoo2wy.fsf@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=74950@debbugs.gnu.org \
--cc=ludo@gnu.org \
--cc=mail@cbaines.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).