From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ULFmLnVrhmTuhgAASxT56A (envelope-from ) for ; Mon, 12 Jun 2023 02:48:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id KNOZLnVrhmRgFQEAauVa8A (envelope-from ) for ; Mon, 12 Jun 2023 02:48:53 +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 46B4244C40 for ; Mon, 12 Jun 2023 02:48:53 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=jwanY7xv; 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=1686530933; 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=KmcgsUD9jLzNFfEIg4Ue5cwv/KMhx5cTUhPrbbLgAEI=; b=ozykfI8qCeWfX3FSNgIMrmfUGHKviijW8h33UcjPk9bG5xRmsrS3dCIbVlfT0oGZR9fHpN HUllysHTQs7fdCBkZtBYfGZPGIpZ4g+NFrWI/nXxov4qOZ/DMV0NvtoG1trv4zuxHAnERg AxTZ5Klhz2qjZ9S/xIqsQbPkk9qj1fzNWF56sqDyT4r7C9Xx8c0McS/ptSEkOBxEqLwC5u KKwvCh7th0CfC4A3Haag91ZPB0BHLdvUVkDel3JQPZ+xu6vVL8r7YMi0cj+XGBX/65gaRD qkqCysUaqPZCIAUfNMseYOCuQsy7ViNQEvcJZ32+4FGxGUgKXNzjDR2rVBd72Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=jwanY7xv; 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=1686530933; a=rsa-sha256; cv=none; b=SUUWn3c+njSmLN+iG4SxfvtwRJmdwee/WL6sFC1JzAie0fmk7fFLJ89vW1kOHH/ZdF9UkB S5zeUnXmLzxkTDCh9kQietBEwqR8E4ACp7P7sbkazUqkQ4SCELXDukilv76+a2u2t1j20p mMtoMZBBmqPJcTlH/AhVMJMss/vYd986Qc1fNV1BJxONzV7jybQyLvkmjVFPHvSV0gMZ4I 12Z7CYuWF1Q0Ah00WNZF9NYWvRmiCWb+ZP+0VvkF9e3Fyswdy0e8CAnQRw6IvaXQ79b8N0 +0PTmsfSrM+VeP9DdMt90BROlKql6aPtcDACFdTMlriaY5pj7pqepzCRDWhJ3w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8Vj9-0007RT-Gx; Sun, 11 Jun 2023 20:48:11 -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 1q8Vix-0007Pi-Ud for guix-devel@gnu.org; Sun, 11 Jun 2023 20:48:00 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8Viw-00084B-CZ for guix-devel@gnu.org; Sun, 11 Jun 2023 20:47:59 -0400 Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-3f9b1f43bd0so41334351cf.0 for ; Sun, 11 Jun 2023 17:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686530877; x=1689122877; 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=KmcgsUD9jLzNFfEIg4Ue5cwv/KMhx5cTUhPrbbLgAEI=; b=jwanY7xvBTs1iyiY4QLI+60IsABDFZydsBjMn0G8xHCKYfcBFYWlZIOv6TXT/o7bu+ ukpDR27ptTFmFRmJn5jR1SUt8uf14qN7HPhCPEBA76L6jJ9xKqfA+XytQtzodrM805NK fD5ldMGQbVSJr8+yReAnq5ovFt1xt4L7fom/PC1+0RCTrlQwiU2qkHR34bCN+fbPuDiS 5Qpv7swAKU6+QbGfKb5F87lz1VzMWU41ZWJB0lnbFREnDl82VVEAZTAy/cDG3ySbCBGv M/O/ie83AkoWlaHBLw9D8jo5yrDqxBlYNGC6i4kALeprXk/U27L/BUPIpIOaHZwJhEma Nrbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686530877; x=1689122877; 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=KmcgsUD9jLzNFfEIg4Ue5cwv/KMhx5cTUhPrbbLgAEI=; b=cKpketfuoSLvNBR56yduC9SVGdcHDDadge6bZHdYirfbqkNt7vEwq/RIYlbhgWbXUD DKMt6tqj8wdOfEBvIUJy+GG2d5d8mpiDmEnLiqL8T0E7c5koLgHDiKgY8NHe6S9WtTq8 //8ip9/A5JsbywABuBg0pZNaRA/H7tzDOpcS20GOfyefYeZzfaqdKO3v9KvL+zycabIe earYHpqRx6M6lEZksRjEJNYa4+QSBFtJQGm7Q/oG9hxT1LWahRRaITtcX0NKEQMs+ANV yavS1eTPeRJSaFWQMnUJ0KwnVtgClReD1np7daZ6Dfk7BKoPhLCkAOB3RBZNQXKBCvJx ULoA== X-Gm-Message-State: AC+VfDw+hGSrQcIm5voGHCZ3waFl00mu4UJ/V3lT8+Eie1OR70iJhWnj Kec2fHLDqo2dcUCIjJm7h14D+KiQtVyHsA== X-Google-Smtp-Source: ACHHUZ4fVrHjRiumN4wnBiLu6UhqG9tzCJ+GM9UM1Fmq8S1R5CdJomN9zVdnLvlj00M5i7VXv56YVw== X-Received: by 2002:a05:6214:29c2:b0:621:17c6:2713 with SMTP id gh2-20020a05621429c200b0062117c62713mr10145983qvb.49.1686530876719; Sun, 11 Jun 2023 17:47:56 -0700 (PDT) Received: from hurd (dsl-205-236-230-101.b2b2c.ca. [205.236.230.101]) by smtp.gmail.com with ESMTPSA id ge10-20020a05621427ca00b0062629cbff10sm2796616qvb.114.2023.06.11.17.47.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 17:47:56 -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> Date: Sun, 11 Jun 2023 20:47:54 -0400 In-Reply-To: (Felix Lechner's message of "Sun, 11 Jun 2023 15:40:55 -0700") Message-ID: <87y1kp8q11.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::832; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x832.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: UNKNOWN X-Migadu-Flow: FLOW_IN X-Spam-Score: -7.91 X-Migadu-Queue-Id: 46B4244C40 X-Migadu-Scanner: in3.migadu.com X-Migadu-Spam-Score: -7.91 X-TUID: Apkl0pbylDD2 Hi Felix, Felix Lechner writes: > Hi Maxim, > > On Sun, Jun 11, 2023 at 2:26=E2=80=AFPM Maxim Cournoyer > wrote: >> >> rebasing causes the PGP-signed commits to be resigned with the key of >> the people of does the rebase, which obfuscates the origin seal >> somewhat. >> >> I think we should continue to prefer merging > > Let's take your argument all the way for a moment, please. What if the > signed merge commits were to serve as the mutual approvals Ludo' has > been asking for? I'm not sure how that'd work, since Git only allows a single PGP signature per commit, as far as I can tell. 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. --=20 Thanks, Maxim