From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id cNLGAHbhhmRWuAAASxT56A (envelope-from ) for ; Mon, 12 Jun 2023 11:12:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cC07O3XhhmQYHQAAG6o9tA (envelope-from ) for ; Mon, 12 Jun 2023 11:12: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 988F23E9A for ; Mon, 12 Jun 2023 11:12:21 +0200 (CEST) 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686561141; 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=6ThgceohSGxGKHjUC3rxl1sthx9v0atpAnWOq5+9BfI=; b=B/eDpJ0RdMrM3r/YlLTsLBwEiDXpm1+9/GgiefxcSdK0ekHOVcXkZtHoP4mviIcATuTsP2 q+f5meK0PsEedvoov28zVO7peNfavb4jUHZS+Di08eWgfrZhWq475G/K4Mf4C3HSCmfKw+ WRdMqDxbuncdHrQewfDJjAlXU03LRDgrInoG1+rxCtZWfCCGTE168HxA8ssNlfYORYDJPG 8c0JHEW1syNtC+VR8OZGEqyQrhKSRh0A3pL6LS8qk1TPqUOui8a32oFXUF+RnKLsNGg7wR usRK8Z5J3xwMKPUPGrR8Tjen6cpqgLPeqoNolvrZrAY66Y01LaU4Vyw4yjHsoA== 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=1686561141; a=rsa-sha256; cv=none; b=KMLSHht3/83Gv5pqsJJjG8J7MJ/6vu3YuPzJSW924Cu3is9hRt9ujlMSs/Qr4XMYAInvWt q8x5MxtoR12kp9ioX3FDycO/+1cdtAWu58XLAyJtE2Rrlowez9LStJIG+9nQKstg+iVIcs pSg88M3xG1YpKYD/aRWRi5cNqvptoLZVUJkUi/fCDdAsPisgOghUsI38xzLKE8eaeI1dSO bWsiZbv+CbAh3q3w+1O4c6qBF/jiD59N1GqkoMG9R5rf8Fhe7t71cBh1U35XbxAeyiYT3I zjlK/dWBK62e/YhpYM9Fs6VhhZa512LdMg0UoG/hLY8OyBADG7PR2loyUv0BWw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8dap-0005NU-Uz; Mon, 12 Jun 2023 05:12:07 -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 1q8dak-0005MW-U9 for guix-patches@gnu.org; Mon, 12 Jun 2023 05:12:05 -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 1q8dak-0003rg-KX for guix-patches@gnu.org; Mon, 12 Jun 2023 05:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q8dak-0001h0-2B for guix-patches@gnu.org; Mon, 12 Jun 2023 05:12: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 09:12: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.16865610836461 (code B ref 63459); Mon, 12 Jun 2023 09:12:02 +0000 Received: (at 63459) by debbugs.gnu.org; 12 Jun 2023 09:11:23 +0000 Received: from localhost ([127.0.0.1]:38831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8da6-0001g9-Jm for submit@debbugs.gnu.org; Mon, 12 Jun 2023 05:11:23 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q8da3-0001g0-Tu for 63459@debbugs.gnu.org; Mon, 12 Jun 2023 05:11:20 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 2D1F427BBE2; Mon, 12 Jun 2023 10:11:19 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f1d36967; Mon, 12 Jun 2023 09:11:18 +0000 (UTC) References: <878rcp8kxq.fsf_-_@gmail.com> User-agent: mu4e 1.10.2; emacs 28.2 From: Christopher Baines Date: Mon, 12 Jun 2023 10:01:21 +0100 In-reply-to: <878rcp8kxq.fsf_-_@gmail.com> Message-ID: <87edmhxcy3.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: UNKNOWN X-Migadu-Flow: FLOW_IN X-Spam-Score: -5.56 X-Migadu-Queue-Id: 988F23E9A X-Migadu-Scanner: in3.migadu.com X-Migadu-Spam-Score: -5.56 X-TUID: eSInJWHS3whY --=-=-= Content-Type: text/plain Maxim Cournoyer writes: > 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. ... That sounds fine to me. >> +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? I've moved the blocking stuff down. As for the merging of branches that others have pushed, I'm not sure there's consensus regarding this. Personally I would like to see this, being able to merge other committers changes, I raised it on guix-devel recently [1]. 1: https://lists.gnu.org/archive/html/guix-devel/2023-02/msg00263.html >> +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 :-). It's intentionally quite high level and non-concrete. Maybe we'll get to the point in the future where we have more specific requirements to meet before merging a branch, but I don't think we have that yet. qa.guix.gnu.org/branch/NAME is linked to above, and I've added another link to it here. The QA badge currently doesn't work for branches, but I'd like to get it working. I've sent a v4 now, thanks for taking a look! Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmSG4TRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XceNRAAiERY1duZQsVNqI4xJXRsMWfVob5GNv+2 BORmjgENto1ZHwUpZOIPi/8FrVk4RzdfNSOQl+7QNIXPD1p7jQkRtDyc0RPRalNA OD7vB2Qruk4FI0HEdl0zKKT114DcBe9KKAZcBM8nVnvB1twnviAfVC2ZrkJYYRx0 TYN2tAF0aINN19pbzUMVqj5mFZQMgHP1/84FTdoRqd/c8McLn2YXR7cYSq2+XzpR l+JJ1DXF5O7pkzCxCpr7gHFHrMqXR3KoyWXvNW8SglEM7lAJH50BooDgdw16EDoa rIxwCSbYNwSbBtwQqWjdUDNr4vtRLDNKBeawwQBWvspa3WB+vd08OSYYK1pt5xLc F2uN2k8aTqiP8IdV3jjsB85+pzwx/j58MVnK0s9WXy63+jx2M0FXWk+QHlLnEnZ4 6iweuVzr28sDmX1sHCUgujVkjhRzhRIeVXyFKQMzWKCCkemUteBF8XjJY778z3qo ZhYX8pHBchvT8yxet0cE/lTcwqBtVoOwIsdbtSa2DrgdMfabWY+k9hszU3M28vHh st3dB2e/wgC5pFJlS7PEPdlc3JERBrOXNOYiK4FgmNZ+JZxy1V38yQcg6x6zwWxo +1fbK2/uyUoDJsn/uavl5xv8C2uMYMA75+02ByF1ojhNUNS8bLZwi1Z25/kBBte5 MiQpR7P8Zkc= =VIOg -----END PGP SIGNATURE----- --=-=-=--