From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id cEcgI5VQf2TwnwAASxT56A (envelope-from ) for ; Tue, 06 Jun 2023 17:28:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id +D/mIpVQf2RimwAA9RJhRA (envelope-from ) for ; Tue, 06 Jun 2023 17:28:21 +0200 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 6B0EE2DDD1 for ; Tue, 6 Jun 2023 17:28:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6YbM-0004xv-AV; Tue, 06 Jun 2023 11:28:04 -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 1q6YbL-0004xa-1t for guix-patches@gnu.org; Tue, 06 Jun 2023 11:28: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 1q6YbK-0004Xn-PJ for guix-patches@gnu.org; Tue, 06 Jun 2023 11:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6YbK-0004U1-FW for guix-patches@gnu.org; Tue, 06 Jun 2023 11:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63459] [PATCH] doc: Rewrite the branching strategy. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jun 2023 15:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63459 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 63459@debbugs.gnu.org Received: via spool by 63459-submit@debbugs.gnu.org id=B63459.168606525817199 (code B ref 63459); Tue, 06 Jun 2023 15:28:02 +0000 Received: (at 63459) by debbugs.gnu.org; 6 Jun 2023 15:27:38 +0000 Received: from localhost ([127.0.0.1]:52822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Yaw-0004TL-B4 for submit@debbugs.gnu.org; Tue, 06 Jun 2023 11:27:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Yau-0004T7-0R for 63459@debbugs.gnu.org; Tue, 06 Jun 2023 11:27:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Yao-0004Rg-O8; Tue, 06 Jun 2023 11:27:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=X2/9kpntvKKYPiwUr5TV4AvZNk7fMX0a50rAXVmN6lc=; b=FPzGsjaI9TqBZbcgls6V CELzJdX3/k3QfnwZGyxcXKittyHvA5mlssDmvSSe4B+0qVseUl1GwnLDkjDCS56ava5K/jbxGGV1Q K4Hqsocr/8Nu5j+57poSUjgndmp5RsIXJmF6vCDV3bwKwlh7DSx4gxTKrcp0QDvG6KoHNHgUwtBr6 I7XePqnPQfpKaTBYaR0Um6BTm1H69Vs53nIMhFqAkgCAGJRTsstlMJ6veOhg9Rivw56ocni9m1jsH W1refZVAWiyUrZrCShQwTRicpX/glaNtyjIudlYBENNj1pFBeAlNViGAXCsNLKDFVFSoUIjUaBU0R 6JnGeX9p38pggA==; Received: from [193.50.110.155] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Yao-0004Gc-BD; Tue, 06 Jun 2023 11:27:30 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <9e9b6e968ab3faa7281d064cdfc59ef32adcf689.1685526070.git.mail@cbaines.net> Date: Tue, 06 Jun 2023 17:27:28 +0200 In-Reply-To: <9e9b6e968ab3faa7281d064cdfc59ef32adcf689.1685526070.git.mail@cbaines.net> (Christopher Baines's message of "Wed, 31 May 2023 10:41:12 +0100") Message-ID: <87ilc07grj.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686065301; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=X2/9kpntvKKYPiwUr5TV4AvZNk7fMX0a50rAXVmN6lc=; b=gI75EwSQzppyRODiNFM1Auby1zzOc0GcJhfpgL5I7OsYCcU/oTmk+cs2TFzUsnU9DhMR3V Wxm3gg1BQ1DE2VJWR+151dRemfIdg87aJVBiS7s4KXP4rOA4RvjMmODGszm4ekso29aSZG HGEaMVy6Gis3pp4DMuGmTU1rROeCCaTnmQwGBVr2ELph9wGydZt4FdCvevabipGT6eCwOq urmps3aYeWLAapOfa7TI4v8G5H4N5Hw92bU7ovh3cUeAPTXmVUo0XaLiND9yDJYdR5tSRD mOmJvm3enNt9N0+RHuZgKaBBVAEBpVdtgVOYD7q+ql1XCm1A5VuTJRhFqpuK4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=FPzGsjaI; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686065301; a=rsa-sha256; cv=none; b=TJ2GNa9tJKFAcxpnL21BLJ4NBgMuU30SvuxdEwkAf6NxNWHWlPvNagE0O3piFIpyldOfX2 8ZBBwYyt7rBnqUAobYl5Js1AUCpmNVJVz3SMi7ZwJ2+WBj8uvRT5CCKiq1NwmEB9TrQHGC HqEIjUNLbN53pbznAVJbkwe71WEH7UCRnHlG1/YwBWDk4HwqIJ7URAit45oMgwV07DWrM9 F8h0/rEAMPWrphmCOdxmANZQRB3Gq2cjkYYYD3Yt5ASzRJwyjTTBbGcPMRpcNJ84wjrScA Dw+7+2dq1n/J+scDWouO+do2KojJBEjOAWTAGU/ZlcbiY7xs525YKMNfiuXI4A== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -4.09 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=FPzGsjaI; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 6B0EE2DDD1 X-Spam-Score: -4.09 X-TUID: hMon4cO2XURo Hi, Christopher Baines skribis: > 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 a= ny > 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): Move the branching strategy= to a > new Managing Patches and Branches section. > (Managing Patches and Branches): New section. > (Commit Policy): Simplify through referencing the new Managing Patches and > Branches section. > > Signed-off-by: Christopher Baines Neat! Only minor comments from me: > +@cindex branching strategy > +@cindex rebuild scheduling strategy > +@node Managing Patches and Branches > +@subsection Managing Patches and Branches Index entries should come after the section heading. > +To help coordinate the merging of branches, you must create a new > +guix-patches issue each time you wish to merge a branch (@pxref{The > +Issue Tracker}). 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 @dfn{blocked} by the issue previously > +at the back of the queue. IMO we=E2=80=99re still missing a footnote explaining how to block an issue. > +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 > +@dfn{blocked} by any other branch merges. No need for @dfn the second time. I think this could also benefit from concrete instructions (like =E2=80=9Cgo to this URL=E2=80=9D) or a cross-re= ference to the Debbugs User Guide or something. Anyway, nothing crucial: overall it LGTM! Thanks, Ludo=E2=80=99.