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 EAulOcxNhmSRlwAASxT56A (envelope-from ) for ; Mon, 12 Jun 2023 00:42:21 +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 EN7KN8xNhmQpEAAAG6o9tA (envelope-from ) for ; Mon, 12 Jun 2023 00:42:20 +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 6FEBBCD3 for ; Mon, 12 Jun 2023 00:42:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8Tkm-0008Mx-84; Sun, 11 Jun 2023 18:41: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 1q8Tkk-0008MZ-9R for guix-devel@gnu.org; Sun, 11 Jun 2023 18:41:42 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1q8Tki-0004Z5-94 for guix-devel@gnu.org; Sun, 11 Jun 2023 18:41:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=OJLIxu/xm/+pTga L2XTHyhdhvZbUyHMAOBAcHaBR6f8=; h=cc:to:subject:date:from:in-reply-to: references; d=lease-up.com; b=c39Qet//iJ9ryg5yAG9mLg4mV5xkvIfNEBDsJwe2 M8OwcUNKmL70M58e8aMpIRhbycc+LViJBPnzgRrhxhtZy11ZWgq/AunGEqmOYb3Gq1/evY pA/b0jgPh0MHrhqAEDHSWGavzzfnxSniBYEkIpgdjDJFGEGtQw6KWclmxO3wU= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 573bd5bf (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Sun, 11 Jun 2023 22:41:34 +0000 (UTC) Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2b1badb8f9bso42321461fa.1 for ; Sun, 11 Jun 2023 15:41:33 -0700 (PDT) X-Gm-Message-State: AC+VfDwLOX57I3c6dV5/fJ2p2Q2Vi0+td9dkun5MVxGEHl2cfCCSUeXF KucMR1X+Y0UIzMlwCbkESuavMckH4ooOq/30QH4= X-Google-Smtp-Source: ACHHUZ4ErjyHf96bdMaEsZxy6aRKsx+h6OYlcigghCbQWBgI7tWABxplcr8skE6Mri8jb27aF/RllKiZjli/wnBJuu8= X-Received: by 2002:a19:651a:0:b0:4f6:259c:c1d4 with SMTP id z26-20020a19651a000000b004f6259cc1d4mr3682375lfb.21.1686523291936; Sun, 11 Jun 2023 15:41:31 -0700 (PDT) MIME-Version: 1.0 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> In-Reply-To: <87352xady4.fsf@gmail.com> Date: Sun, 11 Jun 2023 15:40:55 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] To: Maxim Cournoyer Cc: Andreas Enge , Christopher Baines , guix-devel@gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=208.82.101.137; envelope-from=felix.lechner@lease-up.com; helo=sail-ipv4.us-core.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, 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: , Reply-to: Felix Lechner From: Felix Lechner via "Development of GNU Guix and the GNU System distribution." 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=1686523340; a=rsa-sha256; cv=none; b=cdc1KIthG7M7A6hIOMetLGw44A5vVB3tnCM1UZHeBiAIFs4dglpzfPKhTnFacmuHol2Y6D GQrmY8mXnur/j2UvWwBgZYZi2Dai8M7P7QZXuDUb/ED0xyFy1lhley9tWAZA9EbpM/rwdf mpyU2yyjOOwHLuL9UEiFTfu/OfIVVnzrqT9vPyWyazW70bNSEOigNeHnCVKDtOJ3zOxFTL iLZa7tgQeC+8+fSZhkEh97QV2O8MR3oDMT6ChXXiiqq5g4cUD7sJsgEX5qdmnFkAe+PBWv yI2MIH2OKvDcxmpXEoprepXeU25VruLDkTXRikNuP0yS8akM6xZsr1RJUGtk4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b="c39Qet//"; dmarc=pass (policy=none) header.from=gnu.org; 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=1686523340; h=from:from:sender:sender:reply-to: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=OJLIxu/xm/+pTgaL2XTHyhdhvZbUyHMAOBAcHaBR6f8=; b=KmQWH/2DeYzRnHNeLsldQU22mQA5EsjjNc7xyErWKHAqencjWh4dCZfmVIAA4sA5n3E8SY Vs7Ll+vJqqkFN2QC9JeetXAfEZqTSCf3pKke+6I6h8V0PEoR7x+f6BFMrIuo1GmUSgeoBL y+gqS2VYT2lmeL2OHg4+3ZuUaI6tsAObQJ+HbJMSfA5iWA82w3sLqHVM/v5Vx482H7m5fX nafWW4jPhuB4Z6Y9e9TvdFElJxUsERQP3Kp+9nQb5qgVEg+PcyGiCm2ln1iWjEOKgftTbj DnfppxMxpHyN28j9vYm2oRTOFRQQRxUT9rKFUMp77tVUECGcMJPJNkuf2nxJ6A== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b="c39Qet//"; dmarc=pass (policy=none) header.from=gnu.org; 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: -2.32 X-Spam-Score: -2.32 X-Migadu-Queue-Id: 6FEBBCD3 X-TUID: NVzRNbtlPj9w 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? Non-forward merges could also be used for changes involving just a single commit, although that would create more overhead and result in a more complicated project history. Kind regards Felix