unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Steve George <steve@futurile.net>
To: Christopher Baines <mail@cbaines.net>
Cc: guix-devel@gnu.org, 70549@debbugs.gnu.org
Subject: Re: Managing patches and branches, retrospective and futher changes?
Date: Thu, 25 Apr 2024 08:29:20 +0100	[thread overview]
Message-ID: <tunyb6mbzarwk4nvliv6ruqumftkyaprgsa37ndpjkb3e4ct26@iat5utrstgrl> (raw)
In-Reply-To: <87o79yvqtn.fsf@cbaines.net>

Hi,

I think we should strongly recommend against long-running unmerged branches.

Perhaps there could be a recommendation to merge every 3 months.

Could we add any automation to remind people if:

1. a branch has been unmerged for more than 3 months
2. an odd merge takes places (e.g. the core-updates merges)

Thanks,

Steve

On 24 Apr, Christopher Baines wrote:
> Hey!
> 
> Almost a year ago, the branching strategy was changed [1][2].
> 
> 1: https://issues.guix.gnu.org/63459
> 2: https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00024.html
> 
> I think these changes have gone OK, we've had ~27 [3] branches merged in
> this manor and I think looking back these changes have been
> helpful. Coordination and visibility has improved, and we've been able
> to build and test more prior to merging.
> 
> 3: https://issues.guix.gnu.org/search?query=%22Request+for+merging%22
> 
> There's still room for more improvement though. The current guidance is
> here [4], and I've sent a patch for improvements here [5].
> 
> 4: https://guix.gnu.org/en/manual/devel/en/html_node/Managing-Patches-and-Branches.html
> 5: https://issues.guix.gnu.org/70549
> 
> Let me know if you have any thoughts or questions!
> 
> Thanks,
> 
> Chris




  reply	other threads:[~2024-04-25  7:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-24 13:21 Managing patches and branches, retrospective and futher changes? Christopher Baines
2024-04-25  7:29 ` Steve George [this message]
2024-04-25 18:28   ` [bug#70549] " Christopher Baines
2024-04-26 16:03 ` Efraim Flashner
2024-04-29 13:24 ` [bug#70549] " Andreas Enge
2024-04-29 14:42   ` Christopher Baines

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=tunyb6mbzarwk4nvliv6ruqumftkyaprgsa37ndpjkb3e4ct26@iat5utrstgrl \
    --to=steve@futurile.net \
    --cc=70549@debbugs.gnu.org \
    --cc=guix-devel@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).