From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qGjSAx8Oh2QCegEASxT56A (envelope-from ) for ; Mon, 12 Jun 2023 14:22:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id cPeZAx8Oh2SDtwAA9RJhRA (envelope-from ) for ; Mon, 12 Jun 2023 14:22:55 +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 BE7CD2EB60 for ; Mon, 12 Jun 2023 14:22:54 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8gZ9-000214-QX; Mon, 12 Jun 2023 08:22:35 -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 1q8gZ3-00020O-MU for guix-devel@gnu.org; Mon, 12 Jun 2023 08:22:29 -0400 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8gZ1-0008Ea-Ll for guix-devel@gnu.org; Mon, 12 Jun 2023 08:22:29 -0400 Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-75d536afa43so215225485a.1 for ; Mon, 12 Jun 2023 05:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686572545; x=1689164545; h=content-transfer-encoding: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=FI9/wfUzZqAeJhR8ZItBkxlfhatWowJgrnf8Ubk/nvk=; b=OJeQHpEnWJnwokpyWz2DtL5KhnlgwnDjF9nziG1KZdnUOSg+frJXFj5V+cdeUd8sKx g/8RiIzyWJg00DoD6gnzcTn3r/1ufaQy2SY7wK/0iCSE4O7E1sRMWN+ruY/zZ22z7EgB nMTv0kwVt+eRcA4Ww24kwXK6zC4cI+VZqkEn9L0B9qcgssnuvaKmefex4pmI3Z1b3QjC yPPwke3mKAH2hhx2AC762M0bzFEsyw6klD5xSub27BgeASTLoYZsamTmr2qGU87vUxoW ahJMRh1+oCGun2Qk7cfLHDr6hwahid7N4B23iy4fvN0ob1++xH2P27io3bVKkgoKeNGS x/fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686572545; x=1689164545; h=content-transfer-encoding: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=FI9/wfUzZqAeJhR8ZItBkxlfhatWowJgrnf8Ubk/nvk=; b=RYyCPdSbjigudKxf7GQQMU12+wFuNC5D/nPjXMp6ImiA+wuTzz0sOP4ZbGS6yxzwjd DPF4A9DJ1g+DpkxEKcgwDz1HrYiA+10QR2a+N97rBdZo+J8/AaKND2+J40J1zAmIN408 pcMkMcWG3MUd7OYjH8GK7luLLGGWQctgXHLF1PP0xYe4m3F4ee0bzBaZsnBBOfQULm+k 1XXHiRNlDHRX2GC/tL8QtOq4DzLZfo5OcoVAjUMcYtZunPMvI5LzDVbf1prDg4jcfwVL 6qjMFp3eizoA0UZosJYYyXFoiHshFaK2y/eE+i1M1wxV/xwvlv6oD0LLpPfGgN3SQNf5 UnTw== X-Gm-Message-State: AC+VfDzV1P8kpvfBP6zTiBrm/ArpkWULxDQaAayHIdrV9c9yRctL8ufm yD5RmrlTm0+bvcofQE1q4t+67PiCdxZ36g== X-Google-Smtp-Source: ACHHUZ4c8COzzruEhLnVydKegRfBzgaGXatABYgE2AdN9ownWksI4cbwEHHk8wFtXPH+MgLOzfsrIQ== X-Received: by 2002:a05:620a:668d:b0:75c:9b69:f4b9 with SMTP id qh13-20020a05620a668d00b0075c9b69f4b9mr8365433qkn.6.1686572545588; Mon, 12 Jun 2023 05:22:25 -0700 (PDT) Received: from hurd (dsl-151-174.b2b2c.ca. [66.158.151.174]) by smtp.gmail.com with ESMTPSA id c17-20020a05620a11b100b0075c9e048b19sm2851966qkk.29.2023.06.12.05.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 05:22:25 -0700 (PDT) From: Maxim Cournoyer To: Felix Lechner Cc: Andreas Enge , 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 08:22:24 -0400 In-Reply-To: (Felix Lechner's message of "Sun, 11 Jun 2023 18:10:37 -0700") Message-ID: <87zg547tvj.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::734; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x734.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-Seal: i=1; s=key1; d=yhetil.org; t=1686572574; a=rsa-sha256; cv=none; b=T8ouiGRILE8uYp95R/3sY/dNZy3AZo1A+bqIh/7Q6gCl44kRTyWwPizyaokRjOqEjMsEbZ 8tRaxQ0+G3zUdNCEkhJovtmyiL9RVOhRAoSbFdyP/cWdlveLwi/G7kFwO+RfYJz68n9trY 2azcS09ETH2fjCyAe0+0txK1ZyEc9Cu5Ya0dylB9wExJY56uxOnEeJ2pX1ibrYFbTFtlfa OkH49MNvYrlR4H0rXf/zwb30d2mIxCE7iOHdvIv8weE/PQkykpnaLH6N8BJqNiI5MmP6Ad PQAz56jKqDgSLxRuXmySOnJup1fkVUOk2Fz1etnqy9BYh7VcLVcDMGnhtUWSUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=OJeQHpEn; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686572574; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=FI9/wfUzZqAeJhR8ZItBkxlfhatWowJgrnf8Ubk/nvk=; b=rMT54aRgNI8jCB721giUABXrIpRWdtX3IHmRiTA9hPlWIxurQmyyeXq78nqHtDmMci8jSi E2QTymhZousYao2SXCy4jmRQtUO2ol5Ro1tAmf/5/W1AgRBSGBGjZIQsq8rSncYwa21diQ kVReRqoT7ZKCpmHReP03S+O+vsqhud4oWjKaLfGslwx/8M+AZ4rI3y5zQEoEjp3+J9g/rY 2gWSZEtDJvpsaQyzzeKgSPazMHjmMmxI1VMv9DJaQy7Ib3nb49uoa2uP1iNW1SGm4tjMnA TV2a4z/PYCxdjYe4M7/COPj0hB9BGqwAPTdgeSc7zmholtRh3dhUMz7Qr6yJgQ== Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=OJeQHpEn; 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-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -10.17 X-Spam-Score: -10.17 X-Migadu-Queue-Id: BE7CD2EB60 X-TUID: H/aAc9zd3HVP Hi Felix, Felix Lechner writes: > Hi Maxim, > > On Sun, Jun 11, 2023 at 5:48=E2=80=AFPM Maxim Cournoyer > wrote: >> >> When you rewrite the >> history (by using rebase, say), the existing signatures of the rewritten >> (rebased) commits are replaced with new ones generated from your key. > > 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. > > Please forgive me. I merely hoped to find common ground but apparently > added confusion rather than clarity. No worries, cheers! --=20 Thanks, Maxim