* [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits.
@ 2024-12-18 17:43 Christopher Baines
2024-12-19 1:51 ` Maxim Cournoyer
0 siblings, 1 reply; 2+ messages in thread
From: Christopher Baines @ 2024-12-18 17:43 UTC (permalink / raw)
To: 74950; +Cc: Ludovic Courtès, Maxim Cournoyer
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits.
2024-12-18 17:43 [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits Christopher Baines
@ 2024-12-19 1:51 ` Maxim Cournoyer
0 siblings, 0 replies; 2+ messages in thread
From: Maxim Cournoyer @ 2024-12-19 1:51 UTC (permalink / raw)
To: Christopher Baines; +Cc: Ludovic Courtès, 74950
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-19 1:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-18 17:43 [bug#74950] [PATCH] doc: contributing: Add guidance on reverting commits Christopher Baines
2024-12-19 1:51 ` Maxim Cournoyer
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).