From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YPMvLKyS416KDgAA0tVLHw (envelope-from ) for ; Fri, 12 Jun 2020 14:35:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EM0YKKyS416DGQAAB5/wlQ (envelope-from ) for ; Fri, 12 Jun 2020 14:35:24 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7B2269408E7 for ; Fri, 12 Jun 2020 14:35:24 +0000 (UTC) Received: from localhost ([::1]:51220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjkmB-0004Mi-FH for larch@yhetil.org; Fri, 12 Jun 2020 10:35:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjklr-000424-AO for guix-patches@gnu.org; Fri, 12 Jun 2020 10:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57088) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjklq-0006cz-7G for guix-patches@gnu.org; Fri, 12 Jun 2020 10:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jjklq-000514-4q for guix-patches@gnu.org; Fri, 12 Jun 2020 10:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41828] [PATCH 2/2] doc: Adjust branching and rebuilding strategy to match reality. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Jun 2020 14:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41828@debbugs.gnu.org Received: via spool by 41828-submit@debbugs.gnu.org id=B41828.159197248819251 (code B ref 41828); Fri, 12 Jun 2020 14:35:02 +0000 Received: (at 41828) by debbugs.gnu.org; 12 Jun 2020 14:34:48 +0000 Received: from localhost ([127.0.0.1]:40400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjklb-00050R-Mz for submit@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjklY-0004zz-J8 for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36867) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjklT-0006ag-BV for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:39 -0400 Received: from ti0006q161-2604.bb.online.no ([84.202.68.75]:35340 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jjklS-0006T2-Q4 for 41828@debbugs.gnu.org; Fri, 12 Jun 2020 10:34:39 -0400 From: Marius Bakke Date: Fri, 12 Jun 2020 16:34:34 +0200 Message-Id: <20200612143434.14476-2-marius@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612143434.14476-1-marius@gnu.org> References: <20200612143434.14476-1-marius@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: 1Y4Jx1AyFjXp The amount of packages has more than tripled since this section was written. Adjust the rebuild limits and cycle lengths based on current practices. * doc/contributing.texi (Submitting Patches): Increase 'staging' rebuild limit to 1800 packages, and adjust the cycle to six weeks. Increase 'core-updates' cycle to six months. --- doc/contributing.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 88128e5498..c56f4fd2e9 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -991,16 +991,16 @@ rebuilding induced, commits go to different branches, along these lines: @item 300 dependent packages or less @code{master} branch (non-disruptive changes). -@item between 300 and 1,200 dependent packages +@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 3 weeks or so. Topical changes +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}). -@item more than 1,200 dependent packages +@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 -2.5 months or so. +6 months or so. @end table All these branches are @uref{@value{SUBSTITUTE-SERVER}, -- 2.26.2