From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id eDYQHocGKmaNOgAA62LTzQ:P1 (envelope-from ) for ; Thu, 25 Apr 2024 09:30:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id eDYQHocGKmaNOgAA62LTzQ (envelope-from ) for ; Thu, 25 Apr 2024 09:30:15 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=futurile.net header.s=selector1 header.b=j3k+lOOT; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714030215; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=t9/wG/ayNNoTx/23AiozWTP+tjJTXHJomVRT1J7kDxs=; b=sKHn06UQuv/z04RA/cd7g3FZEBLRHD1vpcYP/Z7+TRNbWfsnU9cR8es4CPhJ4aXCdfMskg ETxp+IqUrAvylR0lKxZaFPoBhFCcMRLHtOXAGacaKj8SqJ6397yUHU5Hms7eCyB/q4eGkL n/FlAcQ0RUo0oTB9Sqje8LdWpqhFJtYIDPkprDMTZM3ev9qz7UqIcwBDmTI4eAPc8YgdBw XveAwKglwVFcli1dl/6hy9NXRph1tL8yT0Ubk4MAIFRvSIHfOJpUH8YTrRBg9jB7wx8vW5 4fneLt2L8tX99yWJRgWTFFqzcaSFoSj8WqgQExrBphsm0hnfv4DRr7Nb3IcAgw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714030215; a=rsa-sha256; cv=none; b=lFU7t+7SYMoIfzNWCD02ePXf/aHZ2W+GaCzYvqnvFDufv663VwhpQuuCR0IMbDiPswDwzq uPuNFQDnTYfklmRvs9nSAnP2EL+7xzO9Lxgcver3FekJUtiT8Ee4gdc+BQW48Hnm0m6Cy1 a/hQpDu27cOznUvZ6RYc5Zi5f9d2hrcWhB2rpATpn1k5aPZreD6nrY6pXNIGOsutRaR36a LiJii2lHK38XYRIDOF6YjQjGg1Bm+O1dWMfShUhlsWzATIsB91swO6yEmxGX7Mfvx7CRPn /u0cIS0qy/mfhwDeRyr8dUwe2z7Ikd2Wr32WzX9G9nmcDjm8pxFn66qByvzGkg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=futurile.net header.s=selector1 header.b=j3k+lOOT; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none 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 25B0B1D006 for ; Thu, 25 Apr 2024 09:30:15 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rztY2-00080B-Lu; Thu, 25 Apr 2024 03:29:38 -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 1rztXz-000802-RL for guix-devel@gnu.org; Thu, 25 Apr 2024 03:29:35 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rztXw-000686-4L for guix-devel@gnu.org; Thu, 25 Apr 2024 03:29:35 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rztXp-0033Jv-Jc for guix-devel@gnu.org; Thu, 25 Apr 2024 09:29:25 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date; bh=t9/wG/ayNNoTx/23AiozWTP+tjJTXHJomVRT1J7kDxs=; b=j3k+lOOTd4PRhgfQ9U9O38s2ne Ge7+eDs3AfwJfYEEhGMUxXmIS4jS9sskS05iRF/2K3EHCA+56cWJWiHLJl9NZzpspqJ196jGAtB+m nRSJtqwgbvubKRjYUHom/vbDJ4R+85np0a5INdg3dJT7FVBpNWGsm3Pa7FDN2I9igZ9IPj3tksuZO mlIJug9x9SPViPexQbvVr8NYyai8SSjp9aUIBK8nDQ0E7IkxjcE/uBr0FzCzYl0z9B7a7s6DGsiqd bqbdmRaSHSUCmKw9Y9MirBg9SHRThnWcO4KR3SewtHwWQBWsA2Qk19uqIECS+AHhPiLhjpYDqY2w/ EzzwXH4w==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rztXp-0005pR-5f; Thu, 25 Apr 2024 09:29:25 +0200 Received: by submission01.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rztXm-00Bwxh-ST; Thu, 25 Apr 2024 09:29:22 +0200 Date: Thu, 25 Apr 2024 08:29:20 +0100 From: Steve George To: Christopher Baines Cc: guix-devel@gnu.org, 70549@debbugs.gnu.org Subject: Re: Managing patches and branches, retrospective and futher changes? Message-ID: References: <87o79yvqtn.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <87o79yvqtn.fsf@cbaines.net> Received-SPF: permerror client-ip=2a0c:5a00:149::26; envelope-from=steve@futurile.net; helo=mailtransmit05.runbox.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -7.57 X-Spam-Score: -7.57 X-Migadu-Queue-Id: 25B0B1D006 X-Migadu-Scanner: mx12.migadu.com X-TUID: 4jI/jm1Fc2iX Hi, I think we should strongly recommend against long-running unmerged branches. Perhaps there could be a recommendation to merge every 3 months. Could we add any automation to remind people if: 1. a branch has been unmerged for more than 3 months 2. an odd merge takes places (e.g. the core-updates merges) Thanks, Steve On 24 Apr, Christopher Baines wrote: > Hey! > > Almost a year ago, the branching strategy was changed [1][2]. > > 1: https://issues.guix.gnu.org/63459 > 2: https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00024.html > > I think these changes have gone OK, we've had ~27 [3] branches merged in > this manor and I think looking back these changes have been > helpful. Coordination and visibility has improved, and we've been able > to build and test more prior to merging. > > 3: https://issues.guix.gnu.org/search?query=%22Request+for+merging%22 > > There's still room for more improvement though. The current guidance is > here [4], and I've sent a patch for improvements here [5]. > > 4: https://guix.gnu.org/en/manual/devel/en/html_node/Managing-Patches-and-Branches.html > 5: https://issues.guix.gnu.org/70549 > > Let me know if you have any thoughts or questions! > > Thanks, > > Chris