unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed

From: Christopher Baines <mail@cbaines.net>
To: guix-devel@gnu.org
Cc: 63459@debbugs.gnu.org
Subject: [bug#63459] [PATCH] doc: Rewrite the branching strategy.
Date: Fri, 12 May 2023 09:04:40 +0100	[thread overview]
Message-ID: <87zg6aq8cd.fsf@cbaines.net> (raw)
In-Reply-To: <f339d15842370b97558b704593848e318462b68d.1683878120.git.mail@cbaines.net>

[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]


Christopher Baines <mail@cbaines.net> writes:

> Move away from using staging and core-updates, and make the strategy
> independant of branch names.
>
> Keep the 300 dependent threshold for changes to master, as I don't have any
> specific reason to change this.
>
> Most importantly, require using guix-patches issues to coordinate merging of
> the branches, as I think that'll address the key issues that have shown up
> recently where it's been unclear which branch should be merged next.
>
> * doc/contributing.texi (Submitting Patches): Rewrite branching strategy.
> ---
>  doc/contributing.texi | 58 +++++++++++++++++--------------------------
>  1 file changed, 23 insertions(+), 35 deletions(-)

Following on from the discussion recently about moving away from staging
and core-updates, I've sent a patch to update the branching strategy.

The key thing is obviously to just remove mentions of staging and
core-updates, making the guidance more generic.

However, I've also added some requirements to use guix-patches issues to
track the intentions to merge branches, as I think that'll help address
some of the issues that came up recently with uncertainty around which
branch will be merged next.

I'm also hoping that these issues then can be used to automate the QA
process, triggering the qa-frontpage to automatically start building the
relevant branches.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

          parent reply	other threads:[~2023-05-12  8:10 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <f339d15842370b97558b704593848e318462b68d.1683878120.git.mail@cbaines.net>]

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=87zg6aq8cd.fsf@cbaines.net \
    --to=mail@cbaines.net \
    --cc=63459@debbugs.gnu.org \
    --cc=guix-devel@gnu.org \
    /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

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).