From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SKD7Apmfh2TOUQAASxT56A (envelope-from ) for ; Tue, 13 Jun 2023 00:43:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id MCARA5mfh2SKigAA9RJhRA (envelope-from ) for ; Tue, 13 Jun 2023 00:43:37 +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 C43E115CAA for ; Tue, 13 Jun 2023 00:43:36 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8ngu-0007tN-Pl; Mon, 12 Jun 2023 15:59: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 1q8ngs-0007tF-P9 for guix-patches@gnu.org; Mon, 12 Jun 2023 15:59:02 -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 1q8ngs-0003EZ-Et for guix-patches@gnu.org; Mon, 12 Jun 2023 15:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8ngs-00088p-BS for guix-patches@gnu.org; Mon, 12 Jun 2023 15:59:02 -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: Mon, 12 Jun 2023 19:59: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: Maxim Cournoyer Cc: 63459@debbugs.gnu.org Received: via spool by 63459-submit@debbugs.gnu.org id=B63459.168659992031266 (code B ref 63459); Mon, 12 Jun 2023 19:59:02 +0000 Received: (at 63459) by debbugs.gnu.org; 12 Jun 2023 19:58:40 +0000 Received: from localhost ([127.0.0.1]:40726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8ngW-00088D-9C for submit@debbugs.gnu.org; Mon, 12 Jun 2023 15:58:40 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8ngT-000884-OE for 63459@debbugs.gnu.org; Mon, 12 Jun 2023 15:58:38 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id 2E1FE27BBE2; Mon, 12 Jun 2023 20:58:37 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 79d400e8; Mon, 12 Jun 2023 19:58:36 +0000 (UTC) References: <878rcp8kxq.fsf_-_@gmail.com> <87edmhxcy3.fsf@cbaines.net> <874jnc98j8.fsf@gmail.com> User-agent: mu4e 1.10.2; emacs 28.2 From: Christopher Baines Date: Mon, 12 Jun 2023 20:53:25 +0100 In-reply-to: <874jnc98j8.fsf@gmail.com> Message-ID: <87wn08tpud.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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=1686609816; 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: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; bh=klftksyWVbSmpTR0hLOi2e0aI8dqKPSputQMyKu4SKo=; b=n8oD6sqsP3kYMF4gWmzG6B0TQL2ogMgyQtdAl1KOnuHeQN6WZT95BqJsLyS0vAS/y8dC+w 2jjWNy824BmjnHnOvIAgO51AnMpSdkckUlwgAoFkpby4Zho7lNj/W6UQ4XJWpBrYrT77cs X6h6KThNMGjTmI+JUz3WkzHiT3dvRurDkYJQ1j97XuqtdWXj2Q5LZxWRfiZn8cbGNWWbdW G/CsEok3SrmdeA5IB0yA166m3eyFuF5R32WSHOD+MO4ZEV17EAliDT50M7v1+0Rvgnv6Bs zUqOOmZN+PUpp78Cap7geaeskm5iCX0QCdHQiEUOb0Rs2Qzqu8VzuMfIbVth4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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=1686609816; a=rsa-sha256; cv=none; b=su0CHqHuLrf09twJ2My0oU3/RPiedoDD20bjiaBEvR0MEbYxnO1Y7H6KZY9JcjDVM5B1gW t3xxenJ4u3smfIe65p7f6nAyjRglRofsQAmiq4wGAz6pkVzTNLraNVICfWBlouMuy+MP8K yD11H49zIYgaPxxF8eDww8MLAinJWZhyyfdmhQyk2PGEYxY6eQFsEf31y8XyKrRfpmnZVl 3uJciTBDbmaNnw7I5BnwZokP++QargU0eLR3DYeb6BBy+HWm0ic1uy1RASgsZMZYZjfHFN fty7cULuJ2hhX2czV7Y5TH3FlUVhTT2j8h85HgJ4eXr8FG3CWmEAmCMKlsRPbg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.82 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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: C43E115CAA X-Spam-Score: -3.82 X-TUID: Q70vho97vTGu --=-=-= Content-Type: text/plain Maxim Cournoyer writes: > Hi Chris, > > [...] > >>>> +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@footnote{You can mark an issue as blocked by >>>> +another by emailing @email{control@@debbugs.gnu.org} with the following >>>> +line in the body of the email: @code{block XXXXX by YYYYY}. Where >>>> +@code{XXXXX} is the number for the blocked issue, and @code{YYYYY} is >>>> +the number for the issue blocking it.}. >>> >>> Maybe by default, since the strategy would be "first come, first >>> merged", we can forego with the 'block' tags, as issues will already be >>> posted in the order (and given an increasing number) they should be >>> merged? Then the nitty-gritty details of micro-managing block tags can >>> be mentioned only when they are useful, e.g. ... >> >> That sounds fine to me. > > One disadvantage of this is that people must now manually find the > preceding merge requests on the tracker; but if we have some convention > prefix in the subject, e.g. 'MERGE' or similar (it's always implied we > merge to master branch and nowhere else, correct?), that would still > make it easy. When the tooling (build coordinator) offers a web view of > the branches to be merged that can be linked as well. There's already a webpage featuring the branches and corresponding issues, they feature in a table on [1]. The qa-frontpage makes the assumption that the issue titles include the string "Request for merging" and have the branch name in quotes, but that's just because that was used as the title for [2]. 1: https://qa.guix.gnu.org/ 2: https://issues.guix.gnu.org/63521 As you say, it would be good to settle on a convention and mandate this in contributing.texi. As for where you're merging, yes, I'm assuming you're merging to master here. > So I think it's a LGTM. Great, thanks for taking a look. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmSHeOpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdBAw/+Ke1SNppqdtm0W0iylJiOLnpIN/27qRop ucEUVKFDgvhzBaiYSsnMMKLLJPW2cfvMrwIYunnTL/0AqY5/ATvFpO1SglSseKRf 3HW06RABEqmH0QG2J4BN4P1xNstoHm/PytE4gL0M8s+heuRjwcn1wgMp200d2rCC fss4ARw34psTJEIMHino+NtCdmixiA8X89Rge5qk4n6xN1pXqKIgsV43vXAFYiba fUYEmXZhpxBTBxTboQT/+bIpghnHII+ewpY6Nq2pEGv4LpwC0WvwL43sIPFTvg0R QzQzJwK4spclq/JQK1Nas2R6PaW/knXtGHDCx9IYLCciJuSoojDnMOXi+EVOwTJ/ yhDkoNa+7BDG1Blul1LqnJvfn/LCEuKRqw3tDyQtEDJPJ7vZH6HYUHpq0G6K7GaZ BIgmnr9o9dZkSV5fW174xiGiVYM3v7sfQ6KNUiKykC4/bkggmFPqTzVdYA4RW80p K+IuijtRuz6+/kFGxs1G5dYSDzpzfTOSiTj2EjVoxXuK1fKig3KGA5w81AMiHHSq 3OlXP5OT3lZH9t8iZH0dPHMOn8oexTy9OQ4lZccbi0kEEPqESoiNvGCixxcGNE6n DmoI7YOs22y/7GIjJ9x20F+CE/rZD3SgTRo5jmooffNA70f9lP6/AgMMF7PVGUQh e1TRmHaTXoY= =paXJ -----END PGP SIGNATURE----- --=-=-=--