From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id yD6LJ6SfL2adhQAA62LTzQ:P1 (envelope-from ) for ; Mon, 29 Apr 2024 15:24:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id yD6LJ6SfL2adhQAA62LTzQ (envelope-from ) for ; Mon, 29 Apr 2024 15:24:52 +0200 X-Envelope-To: larch@yhetil.org 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=1714397092; 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=+tb5bKaK5WbKmpbQfxQqiz3ux24xzk+zyErWw1Js7pg=; b=Y2lWzfdXkFCYcVMeJoZCevB/nMFDjD93LWmjg/aNVcJOPBw8wIwru8rm3kWnCVm7rAhhKW Y3JmdrL51cIKmSCSMDdmzXza6OmpGApLIBU97G/fLqh4KeS5FAyTZX6obwoWysKy/ZcCXt VM4lkdbeE8LYrBuzzcdTV6uWhP8iYeQn3IBjHugSinTUoLkTeN8UoNEXHEZDjDXSwiXl4L 5H+jOuJqUm+bInpVQrMcnW0HjzNcjkcB5/yADotuvtFZz3GoS4CHbDfnjzHIo/u5zjq7ZB xOPc+9frhMmzQesOzn4yWpteLzB9yHQ5y5stlffWvrHYKD5o/E+0jcta4KmFTg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714397092; a=rsa-sha256; cv=none; b=k7OmkGCIpm4wzruhwh+e73CdRIGa8topOV0MiPdDdbSQzQH3SLijyRo8G8LIIDfwRrqXmB gwHMufOxFmi6iaLW0rPS9I7SNxfJ3fETrH3DM098DypXtsMuKTGhq3V2tJaay8txTPrTpX AHwT/JPshBCqBM2UPZVpaLYcln4RwtTxwaSnZfob/oxcI7GmGGnnGourVHQclo1g19KLiJ 2rW9bf5tDaptpuauVLO56VOZZM86KdZeMfHAkqePkE5ohQduqSZY2fnayU2fcvLPspPqXY Ym8dX9pK1n1S33oZSgyjg/fx9nRY/lLfuO89MSWZGGBJ1HQ6b70LRW32iFxxPw== 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" 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 428A566C69 for ; Mon, 29 Apr 2024 15:24:52 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1Qzs-0007CB-Ny; Mon, 29 Apr 2024 09:24:44 -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 1s1Qzq-0007Bt-Tv for guix-patches@gnu.org; Mon, 29 Apr 2024 09:24:42 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1Qzq-0005jA-LW for guix-patches@gnu.org; Mon, 29 Apr 2024 09:24:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1R0A-0002XC-8l for guix-patches@gnu.org; Mon, 29 Apr 2024 09:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70549] Managing patches and branches, retrospective and futher changes? Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Apr 2024 13:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70549 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: guix-devel@gnu.org, 70549@debbugs.gnu.org Received: via spool by 70549-submit@debbugs.gnu.org id=B70549.17143970889710 (code B ref 70549); Mon, 29 Apr 2024 13:25:02 +0000 Received: (at 70549) by debbugs.gnu.org; 29 Apr 2024 13:24:48 +0000 Received: from localhost ([127.0.0.1]:57255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1Qzw-0002WY-1E for submit@debbugs.gnu.org; Mon, 29 Apr 2024 09:24:48 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:56342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1Qzr-0002WS-Fz for 70549@debbugs.gnu.org; Mon, 29 Apr 2024 09:24:47 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B672D14BA; Mon, 29 Apr 2024 15:24:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AB-0e47d-wEY; Mon, 29 Apr 2024 15:24:17 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 2320E482; Mon, 29 Apr 2024 15:24:17 +0200 (CEST) Date: Mon, 29 Apr 2024 15:24:15 +0200 From: Andreas Enge Message-ID: References: <87o79yvqtn.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87o79yvqtn.fsf@cbaines.net> 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -1.89 X-Spam-Score: -1.89 X-Migadu-Queue-Id: 428A566C69 X-Migadu-Scanner: mx11.migadu.com X-TUID: rOV0nCxvZIfr 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. Andreas