[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Managing patches and branches, retrospective and futher changes?
From: |
Steve George |
Subject: |
Re: Managing patches and branches, retrospective and futher changes? |
Date: |
Thu, 25 Apr 2024 08:29:20 +0100 |
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