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 0dxoH8MNh2QUXwAASxT56A (envelope-from ) for ; Mon, 12 Jun 2023 14:21:23 +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 4L1DHsMNh2QVIwEA9RJhRA (envelope-from ) for ; Mon, 12 Jun 2023 14:21:23 +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 119F5306B8 for ; Mon, 12 Jun 2023 14:21:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8gXg-0001Mw-48; Mon, 12 Jun 2023 08:21: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 1q8gXe-0001Mk-H9 for guix-patches@gnu.org; Mon, 12 Jun 2023 08:21: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 1q8gXd-0007ww-Tb for guix-patches@gnu.org; Mon, 12 Jun 2023 08:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8gXd-0001AF-OU for guix-patches@gnu.org; Mon, 12 Jun 2023 08:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63459] [PATCH] doc: Rewrite the branching strategy. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jun 2023 12:21:01 +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.16865724374410 (code B ref 63459); Mon, 12 Jun 2023 12:21:01 +0000 Received: (at 63459) by debbugs.gnu.org; 12 Jun 2023 12:20:37 +0000 Received: from localhost ([127.0.0.1]:39141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8gXF-000193-Ac for submit@debbugs.gnu.org; Mon, 12 Jun 2023 08:20:37 -0400 Received: from mail-vk1-f169.google.com ([209.85.221.169]:53495) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8gXD-00018n-Fc for 63459@debbugs.gnu.org; Mon, 12 Jun 2023 08:20:35 -0400 Received: by mail-vk1-f169.google.com with SMTP id 71dfb90a1353d-4639f65a2f0so1128375e0c.2 for <63459@debbugs.gnu.org>; Mon, 12 Jun 2023 05:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686572429; x=1689164429; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=VwL9jHaN5B0xX4ZpE4AiH7Zs43YY7ciYBnu4U7k5Tx0=; b=qex2n9/55wk9aziSglvJVNCs7SrvaO4svQ1/T0U1ESpD1diEJnDP1JtOM/jXeIrLho IrqbO7zTVxMnO/Dxmz+ChFgltE6m2oK5IKaplN+8+QpWfumnAFHsJ0xiN8v88is6Fnfb V09cjdX+CSvmFIpgZaXScqqpQ/YzyDEXPvGPtjwKzep5AfSRpVf91XkKjc9Oac2HVwZZ PJzR2PjCZzpVhSTWTvwZEzC7xeq9Y5Vtus/HnnalLCbMIbH2TQRDUJDChY5AUVwv8jzV LuH/Az+cFWP1+fm4oIaQpt4LJYwXRcFIbWyYDSjZQstQ4Mav/P0pkjuBsnaQCc0hbuDr fulQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686572429; x=1689164429; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VwL9jHaN5B0xX4ZpE4AiH7Zs43YY7ciYBnu4U7k5Tx0=; b=eUwuMVKIgAOSuu/sxYVcADUKfNR9x34BSmbLvDOLGuYiSi5EYXpshmILpFkmg8LvJB pmj4b2u7BRtvxIB8b/dsFmGI//Xx2gWIkJkf+f8jcrQEgOKEuJjTBBYmFDh9Ir37WnxH 04JiIsNHgIn3IkZepsVzEIiGG4lRyVaH5Irmy2K0yNKTjmmkIxNmMzADKBVxEOOZci0p iv/B5Y6yA/HxyBWdCThapRn4WNFe9a8w/GnjOIdYvn7BTMDjtqHayjVLpRUIxlTFcZKj sfAm4b6pgDTTVBJFkusep4Vw/Z9fApWfOggtG2yJFKR7yQ5P4n2irl6I4tg4EQcjlutP hCcg== X-Gm-Message-State: AC+VfDzhmwoYtMaSxXOF4IBlKVIj8HqFr499gi/sv7W3K3dbwJkbifeU 6RSFdlnlyuvYKid6uJ9HnqNTITbk4WlFuw== X-Google-Smtp-Source: ACHHUZ50EtZtkB1VNvFKCfCPFmLHoZTeXvp3Q8X5ldp40DU1iejOhdfjbw2pyzqUqBl74d4lz2DOxA== X-Received: by 2002:a1f:4389:0:b0:45f:9a8f:bc06 with SMTP id q131-20020a1f4389000000b0045f9a8fbc06mr3926960vka.10.1686572429355; Mon, 12 Jun 2023 05:20:29 -0700 (PDT) Received: from hurd (dsl-151-174.b2b2c.ca. [66.158.151.174]) by smtp.gmail.com with ESMTPSA id t18-20020a0cde12000000b0062142017f4csm433834qvk.143.2023.06.12.05.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:20:28 -0700 (PDT) From: Maxim Cournoyer References: <878rcp8kxq.fsf_-_@gmail.com> <87edmhxcy3.fsf@cbaines.net> Date: Mon, 12 Jun 2023 08:20:27 -0400 In-Reply-To: <87edmhxcy3.fsf@cbaines.net> (Christopher Baines's message of "Mon, 12 Jun 2023 10:01:21 +0100") Message-ID: <874jnc98j8.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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=1686572483; 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: dkim-signature; bh=VwL9jHaN5B0xX4ZpE4AiH7Zs43YY7ciYBnu4U7k5Tx0=; b=pS0Ac2faYK9Jq5iQp2uLFSqwGZaGpKMxENN2rZigdiKGEFcEvDnRuMWqgFtUCKBsxTAtv4 B4XgKssCP2ezglZwWGc55KGVizICeLsEsXVMeGW/AfdhArOFmpg0qW0PlrL//2ITRyic9X VacLZ/1H6ofopL/Q2y0vS/tvCw97QUeuW3FhHPw7BcdW4jsiVp0v/pW+LZkEPIamJVVRFk Morb0zrzb4U6ajF9jNHTI5ucaJOtxsYGwQphKvICYtfjeoBrJRSK0t9plGaO94u9nig0ib z8XI6hmHmibwEM89eOCe+LsiiboxT0SHGFaD8MyYQxQeiNbOwtO9hcK068oh3Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="qex2n9/5"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1686572483; a=rsa-sha256; cv=none; b=fPSbu1gTYCYIMn44BKE2DZ0zrHchnuA9ryH/Utn5iqcXBb7HkXyLtFzCfFtyCzQGhA9RS7 kIEM/ql84xW+XMpIGxTcxkV0yZhicixEgw6gQJxAr1qyx/k+hXlR6ugKH6OguPPphDEnyH oswdl9gIN+k7ekp8Nyh+p8RiPjLjGQXJjhqg6Tt+rQEF7UW/qe3H3ghihdA9r/r5Osxo1l bsBvQFvpFVy8qwo8n1Qccp+Wraq7cwGfYdlxJ4R+yKNLZUc8tMghiAA1EdjLl9KP5RKjSl UkpkNy6Z2hxU/f5Tl0g5MpDcqsO7wDOElofeBvha+x0yPSXOBFoiNbMexWv/8g== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.62 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="qex2n9/5"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 119F5306B8 X-Spam-Score: -0.62 X-TUID: 7qm4YC0WeEZX 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. So I think it's a LGTM. -- Thanks, Maxim