From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YHS/G+glh2TDEQAASxT56A (envelope-from ) for ; Mon, 12 Jun 2023 16:04:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qNnHGuglh2QndAAAG6o9tA (envelope-from ) for ; Mon, 12 Jun 2023 16:04:24 +0200 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 F02D62DDD6 for ; Mon, 12 Jun 2023 16:04:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8htY-0000jh-3V; Mon, 12 Jun 2023 09:47:48 -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 1q8htS-0000eq-Fh for guix-devel@gnu.org; Mon, 12 Jun 2023 09:47:38 -0400 Received: from mail-vk1-xa2e.google.com ([2607:f8b0:4864:20::a2e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8htP-00076K-Rs for guix-devel@gnu.org; Mon, 12 Jun 2023 09:47:37 -0400 Received: by mail-vk1-xa2e.google.com with SMTP id 71dfb90a1353d-45bcbd77636so1166442e0c.1 for ; Mon, 12 Jun 2023 06:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686577654; x=1689169654; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Q6WEtGwOsoPCAR9/E5aPKAijm5xLhMeXMolo02beJI8=; b=VRLhk2GQK8EOO5bU/vlfFXApdrBL6o61/QZC4mcjH+ovatO+kpw6ZWNP8oNznzmGHc uzsz7fAHW7Aa9RFzZR2GEvc42/+9oB1NIPldfyjb7N2Md3k2YeNi2kFFPiE1qbR+utzh OimRcTHzZAO5RY/9YnheHqj73DUJRgljIEZzFM7xA/aePDCV4FQ0G2xLyXYjCfJRzTv9 PXc8x1snoDwpliFvZZJ6h9upo4ZjnMNxWY5vWTOmoUJczbUl7tf4/5TbgCPQhx1xbhV/ Carn+LVn6SyEK5XYy82hwCTrOoGYW0+hrrATnwYcyemJCF3OMPxO+u1K22I5uUCydCsL K7Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686577654; x=1689169654; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Q6WEtGwOsoPCAR9/E5aPKAijm5xLhMeXMolo02beJI8=; b=TfhQ6pA5JaYhTxUHwxpKxgGqh7JlqW5BPsIXPlwNX2V8UvsA2GZz1f5fjD0ol5QXDK SiP8hegv6FNF9JrfKlrRrG5Nbr7LsXaZn/eHoG/NCxtZXMHQSTbt6lWpZE4xj869FI7i H/jAGcE7Srqicf+vycslyiEmRcD5NzKHImvsE8VCcvlFsPRCWF55QhPwTGvH9SZmPcvm VgPFe+xQVhGe9GsSdLXDqAJZrue4A2WO+NSf7GTH25d2wxlBbKGrKwl6AgEFVtUupRRO uD6MWAaYw0y6vhcdKHhWpSd3hnBJliHIG5lyWBBUanUuPgeEfF0wD+TSybA+8z1zxoSD 7D+Q== X-Gm-Message-State: AC+VfDynGRA13jl8P4mlRaZeQU/Qyy8jiD2wZZ6sgMiSo0VrtI4JwP6Y z7SeHVVyARMSjPFryPAKH4YBWdNVR1Wcqw== X-Google-Smtp-Source: ACHHUZ73FvjFMtOpZcOyhALzCcDkmOMU/h4rOQWOfjkGdpNeZ9oZjBLrdR7MvZGwGDSuimrfNjarpw== X-Received: by 2002:a1f:4c81:0:b0:45d:edef:788c with SMTP id z123-20020a1f4c81000000b0045dedef788cmr3619380vka.1.1686577654193; Mon, 12 Jun 2023 06:47:34 -0700 (PDT) Received: from hurd (dsl-151-174.b2b2c.ca. [66.158.151.174]) by smtp.gmail.com with ESMTPSA id w8-20020a05620a148800b0075b168fcde9sm2867630qkj.77.2023.06.12.06.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 06:47:33 -0700 (PDT) From: Maxim Cournoyer To: Andreas Enge Cc: Felix Lechner , Christopher Baines , guix-devel@gnu.org Subject: Re: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] References: <168610879676.2825.9044237296073582277@vcs2.savannah.gnu.org> <20230607033317.826FCC23EDC@vcs2.savannah.gnu.org> <87sfb31qqp.fsf@cbaines.net> <87wn0aadrb.fsf@gmail.com> <87352xady4.fsf@gmail.com> <87y1kp8q11.fsf@gmail.com> Date: Mon, 12 Jun 2023 09:47:32 -0400 In-Reply-To: (Andreas Enge's message of "Mon, 12 Jun 2023 15:13:26 +0200") Message-ID: <87jzw87pxn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::a2e; envelope-from=maxim.cournoyer@gmail.com; helo=mail-vk1-xa2e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686578664; 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=Q6WEtGwOsoPCAR9/E5aPKAijm5xLhMeXMolo02beJI8=; b=JNJv0ZPPwKVxz3L03fkQ5O0FEd2XfSYxdmLi81nnvUuKckZkjw85llslez5qG2XxS0lXgL HqtdL7rmn6VxZdI+3RjmM8BsYT+XgNTXdNuVPFaQ+HHwn1nvz+YDsDRs7I3jHumvmpJLUr 9BG1Wrrik/R1gzlSeAVGpmoxz2k1wBMgu+QfxHOGavW3M4x/hnOLv9JzkcHYOtSvzc67+T EXcW5Hj4W+h0i2xGj1x8gi3h3p6YW49gyAxzrxIZlsrBHSvf6Q1kIskyIVENuD4Q+7EOye xynx7G5HFGnl6yZy8UXdvrzONR73BV1uKAboNVxjXcuwIb25S7ANC9hEXzh2VQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VRLhk2GQ; dmarc=pass (policy=none) header.from=gmail.com; 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=1686578664; a=rsa-sha256; cv=none; b=gCxDwQHCXu5tFPbJ/s+dkoEgr4SxcE7MPnDgRhqwXj8SWo1qCi6oJq3RvTaUXM7AZa32PS n2XtrwPZzW03GyB71tYaO9weifWVKwZfeWgvhFB9e5wJXGiUT0oxEUEMoNbP42NM33XHww G7xYmWm0MgLrya5IGLvtaJIfzqpGYiEDEJKyBWSln9nFaI50TUUWzmu4AcqAQTVcVGcJuo HApHj/qxB1iCmr5LvecWFMGPOztsjeq7oTBEMiAU/rAraAKiO0XeZo3cpN+N1q1YjubeUX sTSwEypL3A0g+RirTp/HJvptFe84XDSkEPGdbaFgAAFrjw7ybKfsmGyv3rCOng== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -4.87 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=VRLhk2GQ; dmarc=pass (policy=none) header.from=gmail.com; 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" X-Migadu-Queue-Id: F02D62DDD6 X-Spam-Score: -4.87 X-TUID: DhpSBYf0MUo8 Hi Andreas, Andreas Enge writes: > Hello, > > Am Sun, Jun 11, 2023 at 06:10:37PM -0700 schrieb Felix Lechner: >> That was probably a misunderstanding. I meant to suggest with some >> trepidation that 'master' is merged into the feature branch, and then >> the feature branch is merged back into 'master'. I thought the two >> merge commits would be signed by the person performing the merges >> while the "origin seal" of the accepted change is also preserved. > > indeed, that is what we had been doing with the very long lived staging > and core-updates branches in the past. Well, we used to repeatedly merge > the master branch to core-updates, which if I remember well makes the > master commits end up first in "git log". So the core-updates specific > commits gradually disappear below thousands of master commits. So this is > a problem. > > But Maxim is right about signatures, sorry for forgetting them time and > again! > > One policy would be to *not* merge master back to the feature branch > (or maybe just before merging the feature branch to master). This would > work well for short-lived branches. Yes, I think we should document as policy that there should be no merge to the feature branches unless really necessary. This will remove a lot of noise from the commit history and keep things in the feature branch focused. -- Thanks, Maxim