From patchwork Fri May 12 07:55:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 49955 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1DF3227BBF1; Fri, 12 May 2023 08:56:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E25D327BBEE for ; Fri, 12 May 2023 08:56:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxNdG-0002Tw-Qv; Fri, 12 May 2023 03:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxNdD-0002TS-0D for guix-patches@gnu.org; Fri, 12 May 2023 03:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxNdB-0001o9-Qq for guix-patches@gnu.org; Fri, 12 May 2023 03:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxNdB-0001D2-Mb for guix-patches@gnu.org; Fri, 12 May 2023 03:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63459] [PATCH] doc: Rewrite the branching strategy. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 May 2023 07:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63459 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63459@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16838781304572 (code B ref -1); Fri, 12 May 2023 07:56:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 May 2023 07:55:30 +0000 Received: from localhost ([127.0.0.1]:53999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxNcf-0001Be-SE for submit@debbugs.gnu.org; Fri, 12 May 2023 03:55:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:33922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxNce-0001BO-CC for submit@debbugs.gnu.org; Fri, 12 May 2023 03:55:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxNcc-0002EQ-41 for guix-patches@gnu.org; Fri, 12 May 2023 03:55:27 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxNcZ-0001XK-QU for guix-patches@gnu.org; Fri, 12 May 2023 03:55:25 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 16AAB27BBEE for ; Fri, 12 May 2023 08:55:21 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 5b211ca9 for ; Fri, 12 May 2023 07:55:20 +0000 (UTC) From: Christopher Baines Date: Fri, 12 May 2023 08:55:20 +0100 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 9d05f9a9f538061e1fdc5aedb0748d260fcf20f7 prerequisite-patch-id: ae24e25c683be86ce0b3fa1fde1bd30e3e08e248 diff --git a/doc/contributing.texi b/doc/contributing.texi index 7bf350ee0d..c54910e34d 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1264,41 +1264,29 @@ Submitting Patches @c See . @cindex branching strategy @cindex rebuild scheduling strategy -Depending on the number of dependent packages and thus the amount of -rebuilding induced, commits go to different branches, along these lines: - -@table @asis -@item 300 dependent packages or less -@code{master} branch (non-disruptive changes). - -@item between 300 and 1,800 dependent packages -@code{staging} branch (non-disruptive changes). This branch is intended -to be merged in @code{master} every 6 weeks or so. Topical changes -(e.g., an update of the GNOME stack) can instead go to a specific branch -(say, @code{gnome-updates}). This branch is not expected to be -buildable or usable until late in its development process. - -@item more than 1,800 dependent packages -@code{core-updates} branch (may include major and potentially disruptive -changes). This branch is intended to be merged in @code{master} every -6 months or so. This branch is not expected to be buildable or usable -until late in its development process. -@end table - -All these branches are @uref{https://@value{SUBSTITUTE-SERVER-1}, -tracked by our build farm} and merged into @code{master} once -everything has been successfully built. This allows us to fix issues -before they hit users, and to reduce the window during which pre-built -binaries are not available. - -When we decide to start building the @code{staging} or -@code{core-updates} branches, they will be forked and renamed with the -suffix @code{-frozen}, at which time only bug fixes may be pushed to the -frozen branches. The @code{core-updates} and @code{staging} branches -will remain open to accept patches for the next cycle. Please ask on -the mailing list or IRC if unsure where to place a patch. -@c TODO: It would be good with badges on the website that tracks these -@c branches. Or maybe even a status page. +Changes to packages with 300 dependent packages or less can be pushed to +the @code{master} branch. + +Larger changes should be first pushed to a branch other than +@code{master}. This allows for testing and for the build farms to +process the changes prior to being pushed to the @code{master} branch. + +To help coordinate the merging of branches, you must create a new +guix-patches issue each time you wish to merge a branch. These issues +indicate the order in which the branches should be merged, so take a +look at the open issues for merging branches and mark the issue you +create as blocked by the issue previously at the back of the queue. + +Normally branches will be merged in a ``first come, first merged'' +manor, tracked through the guix-patches issues. If you agree a different +order with those involved, you can track this by updating which issues +block which other issues. Therefore, to know which branch is at the +front of the queue, look for the issue which isn't blocked by any other +branch merges. + +Once a branch is at the front of the queue, wait until sufficient time +has passed for the build farms to have processed the changes, and for +the necessary testing to have happened. @item @cindex determinism, of build processes