From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 8K2pEu6xL2Z6NwEAe85BDQ:P1 (envelope-from ) for ; Mon, 29 Apr 2024 16:42:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 8K2pEu6xL2Z6NwEAe85BDQ (envelope-from ) for ; Mon, 29 Apr 2024 16:42:54 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714401774; 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; bh=3gNbVS4oyCQDRzb6RhlyG0HPLBVuqjllLSUmmuf46V4=; b=fs0QFOTf5lxbsvXlcrzGMwoWCGAJMGCbs+o3F7GxhFZOWWB+HbRKfXS8Sd2poJkN/PvxHt wwaVqz2fJ4EifD5WmxOSl4dPwd5FkJeKB4jH+VVPHf+zUEXMuykpZ/qCATxiMBkyL21czh D5IGeEykm1xalm4qciJ6ColLaQsksMo8rPH/3AjI2E9zLEe3AtJHr5A6afiaPgMQKjPk5s 3Sg4TwAQZ3+3CzKS+yObAAaTwuf/GN+TmNR0p2UMU+ou/mvnTyzkXZpU88ocY6F5Ik9GRK xtCjlgRBu3GHBAS/VqOQqbm0ty23i1yqiNwcCNrp9ysq689bxn/H+ospjJjdzw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714401774; a=rsa-sha256; cv=none; b=KNlBdEAlDlLr6SxgCWt2DJ9bjof4SWpWq9FuiNugPamiTNrhqNG+47cWyM4G+HmM/DoFwx r80kAlPs2hmT68VKh5ypc5OxoDQryH8iQveKwS99EAI4vqi8ndX87dDgygVsL1xnQ2Vkln nFc3ZOTKmRch/msUNttVRc3ushVAuZ6cQ3qEw3XLm8TMxZs6AdygK6txDIwFM4jZi8WGxO jOXInV+CWlecPCKdJIIGkYa67xWAtRbbvx29MpST8PG/kGooqBa+zXXhBZDdUD10kBop3Z lVTMfO6MAuy5NoIXzoY2zNwFcraX15W3hVjSAKi/kD0OzC++/+yVU0C31T1ymg== 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 7FEC59EE8 for ; Mon, 29 Apr 2024 16:42:52 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1SD9-0000Rt-5y; Mon, 29 Apr 2024 10:42:32 -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 1s1SD1-0000R9-B2 for guix-devel@gnu.org; Mon, 29 Apr 2024 10:42:23 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1SCz-0005pC-OF for guix-devel@gnu.org; Mon, 29 Apr 2024 10:42:23 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id CD32327BBE2; Mon, 29 Apr 2024 15:42:20 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 406bd57d; Mon, 29 Apr 2024 14:42:20 +0000 (UTC) From: Christopher Baines To: Andreas Enge Cc: guix-devel@gnu.org, 70549@debbugs.gnu.org Subject: Re: Managing patches and branches, retrospective and futher changes? In-Reply-To: (Andreas Enge's message of "Mon, 29 Apr 2024 15:24:15 +0200") References: <87o79yvqtn.fsf@cbaines.net> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Mon, 29 Apr 2024 15:42:18 +0100 Message-ID: <87a5lcz0vp.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -7.48 X-Migadu-Queue-Id: 7FEC59EE8 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -7.48 X-TUID: yLps3RUlFzRF --=-=-= Content-Type: text/plain Andreas Enge writes: > Hello, > > Am Wed, Apr 24, 2024 at 02:21:56PM +0100 schrieb Christopher Baines: >> Let me know if you have any thoughts or questions! > > in this part: > +@item > +Minimise the changes on master that are missing on the branch prior to > +merging the branch in to master. Merging master in to the branch can be > +appropriate for this purpose. > > I would drop the second sentence. It mildly contradicts the previous > "avoid merging master into the branch". Writing "avoid merging" instead > of "never merge" already allows for some leeway, I would prefer not to > insist on it. Yeah, maybe it's redundant. I think what I was trying to say is that minimising the changes against master is a priority, so do this even if you resort to merging master in to the branch. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYvscpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdsoQ/9GePG2du8EvHLSiEZs0Z0jV18C0rRcxsZ U9yDOqrNs16kAiroF+/p6EMQ2vaSWmCKS5JeHGyunrmlybSWA98I2bRF97V986XY kO6BMyRFSpkr7B6y8gM943PJt5i7DtBk3T+Z/OCwagSP9nfp0rwfQIlIaL6DRHe/ tv99bgBpPscExoEKcwqGKqEG/Bp0YddXqbszpTRIi0qA+jDAvkDA0QQnyfviirXp NoAFZtIyFBXh2+c+PNbjxJn8UCoWpV3WpMSrPKai02zulu86wIYG0q5V4UGG26ox Ow8uXvkl0Nao1enDcBog6ILMpk9vl+9qjdnalGlS+r2RK4W9P0M0gjWh6N4Yrkjq xhHnrJr8oQZ8kgkopJT4A2G6Ai2zo86KJcgK9BIwRAnGMcCxjOUu0fjst0WB9VCJ gbIOGJtlO7WuHCx+YQIHQx5dvYYtqqIG1Iv+cBkv8UxIZtFaN6wcRF1Lremrg6s1 G/yjX6ljiiCQUqpKjfAETvQ26TUcQFdUQtq4VO9Wib5p4sUjsWDx+DJB9ymHDIgE 48nIuwf7WrqunwEYO028wzUrk24FOyyQZZLIvMpxzc7XR1E8xnmm0nrZZhYV1Zz1 uIb+K532iePkdS2S4tr5r57pOAIgDmZ32I+sGdtNcyUEYGspDymOAbhD4OuNe1Kz qXCgIAuP/VM= =2IS/ -----END PGP SIGNATURE----- --=-=-=--