From patchwork Mon Apr 26 17:51:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 28920 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 1F4E627BC7D; Mon, 26 Apr 2021 18:54:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E0E7227BC7C for ; Mon, 26 Apr 2021 18:54:27 +0100 (BST) Received: from localhost ([::1]:39604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lb5RD-0003lg-25 for patchwork@mira.cbaines.net; Mon, 26 Apr 2021 13:54:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lb5Pq-0002bI-8K for guix-patches@gnu.org; Mon, 26 Apr 2021 13:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lb5Pq-0001mp-1D for guix-patches@gnu.org; Mon, 26 Apr 2021 13:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lb5Pp-0003Rn-VT for guix-patches@gnu.org; Mon, 26 Apr 2021 13:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48041] [PATCH] doc: Clarify the utility of the development branches. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Apr 2021 17:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48041 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48041@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161945952713184 (code B ref -1); Mon, 26 Apr 2021 17:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Apr 2021 17:52:07 +0000 Received: from localhost ([127.0.0.1]:47090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lb5Ox-0003QZ-3o for submit@debbugs.gnu.org; Mon, 26 Apr 2021 13:52:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:36268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lb5Os-0003QO-1J for submit@debbugs.gnu.org; Mon, 26 Apr 2021 13:52:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lb5Oq-0001ew-4B for guix-patches@gnu.org; Mon, 26 Apr 2021 13:52:01 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:41355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lb5Oo-0001IW-GG for guix-patches@gnu.org; Mon, 26 Apr 2021 13:51:59 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 6EC255C0159; Mon, 26 Apr 2021 13:51:57 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 26 Apr 2021 13:51:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=h/mNko8WWN0r+tc82J7R9Zt cJu85GBGO9TjYG/z5aEU=; b=t20M+RjQ0ulfUJeVqFVuNCZyY7P9P9jzpLtCZC7 h3zQl/0XhIy8GZ2XIt26ZKuimmZUIWYnMFzv/AS6UlQQjPN9Ew62KKKi8FDQ1U5Q L5t29QQkdJJe+yBp7IPsAjB+F+S0PhWnI5nJrOypm3q0wzHp0FsJux2c/I1leo3G gbSw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=h/mNko8WWN0r+tc82 J7R9ZtcJu85GBGO9TjYG/z5aEU=; b=krd5+P4gMlP4DfmIBy/ZatKUs32WaPADS kY8lZB+Dn31kfr4jCQB6OwDecSbBTTc4ff10QHIpbQJ0iWOUrGrYQeQligU4shL7 OPeFL2nDFzo6dYRt2zHRmDBStfYR1WzR+5EyW1wDx6tqKu0RI6OlGIyOibUqlOj9 fTJzO/I9v3LnrKbV3cQqSUHfspZ2rdoxFsNEM++YfGVKqJPZ8gkHDKL/AbokZNkt zQkx4EDVVVJ9CfUGtZXl/DRbl4rvByCYLSDGe08HQpNBYyCpNbEvK5sUcXAr3U48 TbbZHyNKhUlwdTJ+cKS0C0lvU2t8XHVd9aerAZx39Cz+XUyWuRzOQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddukedguddvtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetueeigfelheekveffveetffeugeeuud dvgeeiffevkeeuffefteduvdfhhfduhfenucfkphepuddttddruddurdduieelrdduudek necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from jasmine.lan (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 0F7A81080063 for ; Mon, 26 Apr 2021 13:51:57 -0400 (EDT) From: Leo Famulari Date: Mon, 26 Apr 2021 13:51:51 -0400 Message-Id: X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.28; envelope-from=leo@famulari.name; helo=out4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-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" X-getmail-retrieved-from-mailbox: Patches * doc/contributing.texi (Submitting Patches): Clarify the utility of the 'staging' and 'core-updates' branches. --- doc/contributing.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index d5025dd189..f28a502338 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1080,12 +1080,14 @@ rebuilding induced, commits go to different branches, along these lines: @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}). +(say, @code{gnome-updates}). This branch is not expected to be +buildable or usable until late in the 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. +6 months or so. This branch is not expected to be buildable or usable +until late in the development process. @end table All these branches are @uref{@value{SUBSTITUTE-URL},