From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 4B/OJ12FhmQ1+wAASxT56A (envelope-from ) for ; Mon, 12 Jun 2023 04:39:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YFHlJ12FhmQ2VwEAauVa8A (envelope-from ) for ; Mon, 12 Jun 2023 04:39:25 +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 ED8B95B67 for ; Mon, 12 Jun 2023 04:39:24 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8XSR-0000lC-Sl; Sun, 11 Jun 2023 22:39:03 -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 1q8XSQ-0000kv-3m for guix-patches@gnu.org; Sun, 11 Jun 2023 22:39: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 1q8XSP-0006Nf-S5 for guix-patches@gnu.org; Sun, 11 Jun 2023 22:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8XSP-0007xJ-Ou for guix-patches@gnu.org; Sun, 11 Jun 2023 22:39: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 02:39: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.168653748430497 (code B ref 63459); Mon, 12 Jun 2023 02:39:01 +0000 Received: (at 63459) by debbugs.gnu.org; 12 Jun 2023 02:38:04 +0000 Received: from localhost ([127.0.0.1]:38253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8XRU-0007vo-1l for submit@debbugs.gnu.org; Sun, 11 Jun 2023 22:38:04 -0400 Received: from mail-qk1-f175.google.com ([209.85.222.175]:62757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8XRS-0007vG-2d for 63459@debbugs.gnu.org; Sun, 11 Jun 2023 22:38:03 -0400 Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-7606e639083so45488785a.1 for <63459@debbugs.gnu.org>; Sun, 11 Jun 2023 19:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686537476; x=1689129476; 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=Qw+VQVpob0MQHzU/pvvwkgf9n9J9tFMOnFJtFN/BhR0=; b=kcJfA+MY60OuvXs6jsuGy3yrwcBuO9YElycwI+ZLc+hhnGjcaRjuTDQf3l/o4J0HKC i8v6rbrHQOuyvd2HIO21tFV7hMufH2lc/8PPsriXbLvwnTZp/KmQ0pabMGfyUqJ9ux1W 4e8zuZ2NFwulBNmCGux8zlEqSLgy0BOr0UhCYdBdqJ58ZWQEClFLvfa0YOP6bmXVLsW6 xtxCjWw5HOOIGq5lqNbSfT1CBLr8Rq4riKe4FLMWx5HxHT/KFuGylo+WfzXMuBCOKzn1 38VhrTcnHKXMp7D9NN+rXhSBLqqvreBork8M2m1HHCrtUEP1D3k+yv1TnD5Py+hz/1Y0 dISQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686537476; x=1689129476; 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=Qw+VQVpob0MQHzU/pvvwkgf9n9J9tFMOnFJtFN/BhR0=; b=VXQvEyXSRUooiqYk1XVVvWYUp7J0zByvqR5C/iveTjfNievL8BlfnvbEvl1b17uEge C5NdtPna5BRxOfyaxNobz+Ld7mTonCPwOjgocpYYnsrFYtbBjy9iFC7OGMlyPDbpra5Z ZqNyKlut2YWc9hbBXG1sbdN/l7A50Lb1jT7yat6tVoK2phK90lmExu2IxTk5wZmaJZ8K tPPp01qqILFy6P+9+xFZETxr2EZwzj2F7DRtecrLiJ7LdQWddkn77/+Kzg58rLeLE6Gh H15SavgjFsA77NDQhEH5UHf16SHGB86kOQPYs1mLfo6qK3bNwYYZz7fU1mVt1Vfmv8M5 pUDw== X-Gm-Message-State: AC+VfDzusH79hq+LeEZZEW0IKmavYNiEXkHmnJDgByOyOkCq4b1vshOE eWO/nxDlNYSdYSf59m1ak0PZTWVPJd4Z0g== X-Google-Smtp-Source: ACHHUZ7EH6A6KqwkZOxYpeQz9tTtvQHYLWjMpqQsF1GbfBQ8R/hxtWmyPsLqUC+pOVoIKMWTLCg65g== X-Received: by 2002:a05:620a:3b12:b0:75e:ca48:51c8 with SMTP id tl18-20020a05620a3b1200b0075eca4851c8mr11924662qkn.4.1686537475779; Sun, 11 Jun 2023 19:37:55 -0700 (PDT) Received: from hurd (dsl-205-236-230-101.b2b2c.ca. [205.236.230.101]) by smtp.gmail.com with ESMTPSA id m16-20020ae9e710000000b007592174cb08sm2587570qka.10.2023.06.11.19.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 19:37:55 -0700 (PDT) From: Maxim Cournoyer References: Date: Sun, 11 Jun 2023 22:37:53 -0400 In-Reply-To: (Christopher Baines's message of "Thu, 8 Jun 2023 15:23:28 +0100") Message-ID: <878rcp8kxq.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=1686537565; 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=Qw+VQVpob0MQHzU/pvvwkgf9n9J9tFMOnFJtFN/BhR0=; b=E2w1sFV5H5bi2MpV8jW98DFPQ0MjmnVr13YtBbui9J/pd2Fki4LzpOmXyJ6LCRXn0t0LSK shnYKAZTJp4jKMSGc+4/2a5vlz0sBg6PIzLBDlsEvOlqSvozUllwF5C3RspiYZjUVzDJ+b FMPgN9AdsS1RDLoWTfkYCh+EZRU35byfxLwjtyN+jHwLW8Fv7kf5HcpKPHber0tIR0lTfW kqryU5bWDi82Ief3s64+rwyrRQ/3VWxU5s+tQ/ZiY/D7Vw0EPfVZ6N7NE4IMoBHG1tDFWZ 6rTFeaqCxKLz3Q4lKq0Xiq/M1J9hdZMMEL8tHE/24MU8O0y+YcIkprKnb9eFuQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=kcJfA+MY; 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=1686537565; a=rsa-sha256; cv=none; b=SOOeJtklpl8SLFEgAyjoNCZQ7VutWhLDBIgpPhr5NvP50Tb/khfyOW+dEwpYGQ+qEKeaZ0 YNJ/oEMoKMUxkL7N4fZoqT4pgTzdDVFlb/Y3c+fDGxKqZvXl3TALWRlpsfoiKOPhPBPAAI yG5+3e0D5keJYoegT3zGCw6kkbI+8JDNhhCvL5lfhIc9099dMYNrrxYEgYvpgNJdl+Vr5j n6J/LnmuUgyHCn6VrjXUL2ibM41GChnfCvWaxYycsD0NSsneeajQVz0LwogNokYLQatpKT XO4dRWDE2U9Z/tjVETMTLvgYHBvDvLa8plEwQw16LbCfS0hpjLjXIT6YihO4Ow== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.12 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=kcJfA+MY; 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: ED8B95B67 X-Spam-Score: -2.12 X-TUID: y/c7hY+Os6kl Hi Christopher, Christopher Baines writes: > 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 any > 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. [...] > + > +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. ... > +Normally branches will be merged in a ``first come, first merged'' > +manner, tracked through the guix-patches issues. If you agree on a > +different order with those involved, you can track this by updating > +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 blocked by > +any other branch merges. ... here. Can anyone merge the branches of someone else that posted them to the tracker but 'hasn't gotten around' to merge them to the repo (e.g. gone on vacation), although they were fully QA'd, blocking every other branch merge? > +Once a branch is at the front of the queue, wait until sufficient time > +has passed for the build farms to have processed the changes, and for > +the necessary testing to have happened. What does that mean concretely? How can I track the build status of a change? Please at least mention the QA badge which is visible from issues.guix.gnu.org and perhaps other tricks I'm unaware of :-). Thanks for working on completing the documentation of the new work flow. -- Maxim