From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id +Bi5NZUHKWYiRQEAqHPOHw:P1 (envelope-from ) for ; Wed, 24 Apr 2024 15:22:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id +Bi5NZUHKWYiRQEAqHPOHw (envelope-from ) for ; Wed, 24 Apr 2024 15:22:29 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713964948; a=rsa-sha256; cv=none; b=iFxNt+xtAey08yPpPqFh8YCK3gq25yS6FRYrPwlgKetaYm1KClYim3SvvBr1dJm9aDrQJF NAdBOssEVYKsnAKhyrQiHkYszsuE57ys1nFuQui6FKbnivyTcHaNtofmFDvZMArx4WZVFY GWIIVRRa8GZR2yLAYUqAIv0ONx6ba7u52OpIa+4x+v4oEjyAXCsRWagWSuddmS6vcvj/fb afG17KDdeqzb96Q8pEWJaTSmbJ0rfetzxMQxkTElUbQ9dfsTa+y4/93W2Mfe7UBcRaPm68 CjgBMcF+Im9WwT9x4GUeOHWQGB1L33jQ2fRUYczdKTm8xoHC6BqwLTbth1+l7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713964948; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=8ksN6/MWDPQGHtH+vJVm9J0SbAVlbE3Emnt0A2NtOE0=; b=AYJd9Przvb7NnWd5J10kb/EERMcRriZsT3CLb07X2roM/OhNOeGk3Sg3iRdDgzt/m+X69h +xMkZ2krL92x9p1N8jRpZgWFZ6Z7YswhrHLfk/hV3nbud0k7R+a/62z1ygCPzNcgO8gGZt lhWEHN+UhKMnDYs037WPbQT/REMT0ubZHiq33Helfde3n0P8tv2pF6OqZLkh2C9Og9MVIV Rw1fg55rgT5bGUTVoWu4r1q1AcBy02JPpu8C6vHrioVuTfH1nQRGNmeyyXWI3NPh0w0AVt LztxHPcNJwy41ljRg87XWvpZ0E91AmdHJY6dpCaYGX+hYeIEfD24qAMZPnbz1A== 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 C2B627C1C1 for ; Wed, 24 Apr 2024 15:22:28 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzcZY-0005UM-35; Wed, 24 Apr 2024 09:22: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 1rzcZW-0005Tv-F6 for guix-devel@gnu.org; Wed, 24 Apr 2024 09:22:02 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzcZU-0005RU-Gz for guix-devel@gnu.org; Wed, 24 Apr 2024 09:22:02 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 3223527BBE2; Wed, 24 Apr 2024 14:21:59 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6575fcf6; Wed, 24 Apr 2024 13:21:58 +0000 (UTC) From: Christopher Baines To: guix-devel@gnu.org, 70549@debbugs.gnu.org Subject: Managing patches and branches, retrospective and futher changes? User-Agent: mu4e 1.12.2; emacs 29.3 Date: Wed, 24 Apr 2024 14:21:56 +0100 Message-ID: <87o79yvqtn.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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-Spam-Score: -7.48 X-Migadu-Queue-Id: C2B627C1C1 X-Migadu-Spam-Score: -7.48 X-Migadu-Scanner: mx10.migadu.com X-TUID: yN2iEhzQwBfD --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYpB3RfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdQnA//Snz4ZWMeR3pJ8fyzclxc6tNUX1Q9gZGU 4kZaYQT/S/XnG53cSRPJxawnwWCli9ylv3piD0Xr8ZltfPomnZv8bKLztygEyCkD gwQnOF4oxLIcSWKG5vsrIAdhDlY4XHhj+HPa55DQSfSqKaYfwWdMy35vXUiSInOw 3B07dPCrOAqMGwGVMPjDLm238hpFE2L0jQi93vFdCrIIueeKnNwhwWVmeZTxYALA ifMDwP3EugH8Djq6abweBIpEVY+g1915y/S4i2H8GirgqDfA+Hd1GGIFR6mr+d8e zaAcPyupYNwy/lzHRQkCwjCy/OWg3PabDQfADV9k/z2dsEB7+RVOdu93wwy9UF07 YNsBnsHA4MHsXsyj9hpWcHEWOsjuFhHnYDYW13Zlo8YdmncyTl/NMnXmMXeTjhMM qN5pbABSbWdHu9gExUrhTZJD60AwDfv/o4k6JkI5lYHrmrNwWRsL/lptbKRZB6NM BnezEQik7/v8Nqldb8pxO7rVqdKK5RLl3XnktgGxW63mKaRGBxwjsQt2N/CsZ9Xh Bs7ypyu2kAYEY97ZNmRbcmBrPDN1GdfXe9Pi6IeqQGaOHtTLmTjxzAsx7TL0+qFa tWYZ8nGac3RaWckUQYSpW0JiguytQIEHZaUO9n30/z3xDX3nz5uTbfRCni8f0scZ CcrOdP/RqYo= =yr/d -----END PGP SIGNATURE----- --=-=-=--