From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 6EggGI3QK2aQFgEA62LTzQ:P1 (envelope-from ) for ; Fri, 26 Apr 2024 18:04:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6EggGI3QK2aQFgEA62LTzQ (envelope-from ) for ; Fri, 26 Apr 2024 18:04:29 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=YKVvC5sy; 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=1714147469; 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=tTIC2yivNjurVba1/8ocmIpuYHHfLSKbL12j1NcZuV4=; b=TkbPPfiBmU429VB50XKnZsCNMTFZvwgJdRwG25Ipq7NvZi7lyPqnHkF3M2VBHjRY5MpPaU 0HApF3JkG8COOg9zRp3RkLYHwu9WBbHk6CRg8obOBUJ55d+/QokSjkcZu6ySlaw039IsZt McGpYJQe6TAieuue0jXhdJSkZczOKhbq06kLb+n/+oWZQj7V4VsYMq4Oh4RVfHG4w+C5kF zPHyXIlHiu0O3vF7XI1wu+WOPTqYDz28KMhBgI1U6VCOEj+nM8m1YXfgb3InScMBExaQg/ PbXOd30/YSVSELXvOxXpbCfXeek7hbjN4FjsLEvdlmlhrhZsoTC/DotHC9lNSA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=YKVvC5sy; 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-Seal: i=1; s=key1; d=yhetil.org; t=1714147469; a=rsa-sha256; cv=none; b=ednDcfRPh4K5FvhTuhzWFR03lJ/JRi6+oySNNlBfh8J9Y9ZwAX2obknhYIZtymGxWpUxe8 tWmdL32c4A/7pqF97elfTRlkqRZkcaYoURO0c8UtFklgQeQYW07vRaxtfwOfK6LVmfVl7w gd7Atf+1nUddctknajOdIBvF1o2StLRR837t4bZy4L0vOj594ihP6zmbiWMYxpV7Mub26g oKgSpi38CZMhkJn/30LpEwCAPDsqGp6156ppCY67U7A0miahNcuEuSugYBIEYORoSfeqcu O5mRX6al4kDj7IQik+7+tRelzbOqlg3teHqVpztQd170TPbXeXAwjV3F6Pqfbg== 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 3CF2878E4C for ; Fri, 26 Apr 2024 18:04:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0O3M-0006fQ-Ix; Fri, 26 Apr 2024 12:04:00 -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 1s0O3L-0006eu-9b for guix-devel@gnu.org; Fri, 26 Apr 2024 12:03:59 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0O3J-0001TQ-Az for guix-devel@gnu.org; Fri, 26 Apr 2024 12:03:59 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-78edc3e80e6so156953385a.2 for ; Fri, 26 Apr 2024 09:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714147436; x=1714752236; darn=gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=tTIC2yivNjurVba1/8ocmIpuYHHfLSKbL12j1NcZuV4=; b=YKVvC5sy8PCHZXKkguoKlRZ6UyMifcbHo0/qFxO5hCeJunyH1zG+ooIVy3WsO0vpMh a9n+KVjth5cby9XKqoAGkt/QttHbrJ5V5GQ5A2ugsOBtgL2SagNb8XHDHPeq5kWwSOIK 1gwuGZhbAQMzSRgmzPcmA8RHzXRkgGn0idz0KWp+3Rt88RWpGyf09HeR2C2b7OgNPWlG IQXDOz4jLqnvgSqyKxmohiB+FDkuiaPz4LbKE8HSLc9D+N41eUC/jB9lrCyJyulbQI66 ENkOeQbzUv9qMjULX689eUO02lr76YxLoj3g0EZvftuzB3ww79aZpLYQ+pe/G6E4s3sW vpSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714147436; x=1714752236; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tTIC2yivNjurVba1/8ocmIpuYHHfLSKbL12j1NcZuV4=; b=GVE5v/97fRaHzrJbjEBp1Ta2feChaz0A3wLBD10r248UFX4XSNDSFnx+ir8CB5TBdJ 0jBULcdm3iOfVqNyTL0D7+kZOKfnkDl03RXApXMoDFnN4KEFteWSZxkJj2aRFh5KwMRQ BPB42qm1rxmKbmRt1/LzU5hXdAUHU/NbfNfEU+mssfjh75Z8SwoYdhpWiJn+jtzX9L7N /3ObRWEWxmWLziVpu7Mcd3phLkux8CQX7sSAlmuE6fmtUmrfvXJh+IMonpKVCpM8i0h5 Kwk2m2eFvb14vnBJLYTlbdOYFFgsuNIVO90WqUCWLN+xah50sB1lib6dT2CWgJb5eP75 8QOw== X-Gm-Message-State: AOJu0YwNubMo+PRiECjrpMjMkhWr90/KRE0RzFCdh18wADksanQjHYz1 nS96vVyF0AObLi4D0Qid2pj6uVzcoF9hSosn7TwYCo30Uc7xaLj79C5TwNx2 X-Google-Smtp-Source: AGHT+IE9SENxYoSJml0Z/44he2ZCeMhftFIjL0JAjq9082n9XUNOwbGjHOOiw/cGlOtu92MRYInHww== X-Received: by 2002:ae9:f00d:0:b0:78d:6e96:937a with SMTP id l13-20020ae9f00d000000b0078d6e96937amr3552991qkg.70.1714147435679; Fri, 26 Apr 2024 09:03:55 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id c5-20020a05620a11a500b007907a91e573sm4172978qkk.130.2024.04.26.09.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 09:03:55 -0700 (PDT) Date: Fri, 26 Apr 2024 19:03:56 +0300 From: Efraim Flashner To: Christopher Baines Cc: guix-devel@gnu.org, 70549@debbugs.gnu.org Subject: Re: Managing patches and branches, retrospective and futher changes? Message-ID: Mail-Followup-To: Christopher Baines , guix-devel@gnu.org, 70549@debbugs.gnu.org References: <87o79yvqtn.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="QEUfkmCGsc2QTYCk" Content-Disposition: inline In-Reply-To: <87o79yvqtn.fsf@cbaines.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Received-SPF: pass client-ip=2607:f8b0:4864:20::733; envelope-from=efraim.flashner@gmail.com; helo=mail-qk1-x733.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -2.95 X-Migadu-Queue-Id: 3CF2878E4C X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -2.95 X-TUID: vozUokpwH8sk --QEUfkmCGsc2QTYCk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 24, 2024 at 02:21:56PM +0100, Christopher Baines wrote: > Hey! >=20 > Almost a year ago, the branching strategy was changed [1][2]. >=20 > 1: https://issues.guix.gnu.org/63459 > 2: https://lists.gnu.org/archive/html/guix-devel/2023-06/msg00024.html >=20 > 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. I'd like to just say that this (without checking the numbers) is almost 10x the number of merges we had previously with just the core-updates/staging branch strategy. > 3: https://issues.guix.gnu.org/search?query=3D%22Request+for+merging%22 >=20 > There's still room for more improvement though. The current guidance is > here [4], and I've sent a patch for improvements here [5]. >=20 > 4: https://guix.gnu.org/en/manual/devel/en/html_node/Managing-Patches-and= -Branches.html > 5: https://issues.guix.gnu.org/70549 >=20 > Let me know if you have any thoughts or questions! >=20 > Thanks, >=20 > Chris --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --QEUfkmCGsc2QTYCk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmYr0GsACgkQQarn3Mo9 g1EEwg/9GFu+h7vylBRFLjdddWZR713wRSsc1BN6V/9FMMUCnVjCXCX4hTcvbqcF RbUhwP3O31Ui3JyJOTOA51KwNCracsHrUJJjgVxaVNs8VBKCqayxOjQdwoLBqnPu EyETqadg1ZPltYLDE/bHad27ZaKeG69gTtPFW7bgiUycSL8HZis8+CxHFTbcT7cU bOGxHF5Q+VVzYlSz5mDoDm0V7hE4gb93zD3eCBCptLEX9OWoP5a14WnHEF08vy/t 659PZdbndVA6wygtr94xPbaJE7oIfHOvsCGwvmdbYl/JyrHnaXk2i9A6S+6Whr7g 5A1LQDZqIrmHrn+9BT0c4mT4D8mD/ePyzDs2dtShKj9/sMpitz2JqIigP+JPya+d enVwmx3myHWu79e6i35Rmoh1yl6UQo5jsSF7ViHHStwVRxDE18JGXLcbde2qnbcd 6wt8F8SwXonZge+zqd8WJuicgIWbg/5gdqmVxztIQ++N/UyY5JKZBOEEgFeJmfo1 juN69Uu5KDQgsTMT7d21IBa+JmJqx7SipSvKX4kf0XTHcNOLT7DLVdZTsInPuvoW qsn/Nqn4v/0OdTyyaTedXQsI419QDLMqi4L+stPed5k+MtM0yN0weDaMTb2P2pg4 t93HFCPgMahQQr3eeXEJ74r33nOIZFZZeoHu0GnVkPPOywE34ag= =pXQy -----END PGP SIGNATURE----- --QEUfkmCGsc2QTYCk--