From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 wOtjMdxwhmR5KwEASxT56A (envelope-from ) for ; Mon, 12 Jun 2023 03:11:56 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 6NCXMdxwhmRQkgAAauVa8A (envelope-from ) for ; Mon, 12 Jun 2023 03:11:56 +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 67D161BD93 for ; Mon, 12 Jun 2023 03:11:56 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8W5c-00024i-9g; Sun, 11 Jun 2023 21:11:24 -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 1q8W5a-00023R-Hp for guix-devel@gnu.org; Sun, 11 Jun 2023 21:11:22 -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 1q8W5Y-0004za-TO for guix-devel@gnu.org; Sun, 11 Jun 2023 21:11:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=c3+20Jzmsfhwrn0 CQOM/QojRx5h+quBEhpDjkmbSmX8=; h=cc:to:subject:date:from:in-reply-to: references; d=lease-up.com; b=S3J7Eev5OwlIGtyM3L/QoktR/20j5GqezSpekKa7 O7mWnoWuZSAJMaOl0A/4gnA7I9IEMMLaG0pOzmbb4iAZb07Mu/pMjprqYCM5rHTcQSjsC2 cL5Rlr4/YStz9bGxPYJQ7ZshrMeI2y0JYcHvEczf8QaSTXumGN+B6+t6XvZ2M= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id ee059379 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Mon, 12 Jun 2023 01:11:16 +0000 (UTC) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2b1b72dc2feso42292131fa.3 for ; Sun, 11 Jun 2023 18:11:15 -0700 (PDT) X-Gm-Message-State: AC+VfDzZtqs3sO2Y1NmRnUrv46gjXww+HBiG3M3m57oGyVZmsvGI2TLf U1o8bpkSJUYfkYFFoqhyxeY8S6xTz+gQw4r2k0M= X-Google-Smtp-Source: ACHHUZ7R/K8sZpo3Ytcpn8vjMBeu+adz6EjPx2ve0C9neRppJ589vwXR1k7QZGWoM9ZEL3Ff7PjhKtornpeJIEh+X/A= X-Received: by 2002:a2e:97d7:0:b0:2b1:d588:a1a5 with SMTP id m23-20020a2e97d7000000b002b1d588a1a5mr1946087ljj.52.1686532273800; Sun, 11 Jun 2023 18:11:13 -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> <87y1kp8q11.fsf@gmail.com> In-Reply-To: <87y1kp8q11.fsf@gmail.com> Date: Sun, 11 Jun 2023 18:10:37 -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=1686532316; a=rsa-sha256; cv=none; b=jMRRNdS2nHMsROpB3dfF98U65cPdW0ct9euSXiFnH7K1aPS+Sa+yyCGXA+khsHQoQvzMib UV+2GOE7a4t0kE5t/ncYw5zyRJ9Ukvgb7fOwlOLl+MhS8ijJrQXu7Gxya8yCZcmlUnmbnv c3CLrDhKMtf5eTuYXPgX3hmBMJEBrNijaw7hT+trwYNqgTylMQwOMZkfT5FwDm04IoQNxw kI9WRr2VqDSNhPlCHpxdVu9mJCaPg8QPOgQXBQrh5b0CXnX5toHE9CaGysrfYOlOkyKAuk XP++MESCFsk0byCCcX/CwrVFh5E9G3ucPbwqQHqco8Blnhs1BCueRrRaNOxeCw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=S3J7Eev5; 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=1686532316; 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=c3+20Jzmsfhwrn0CQOM/QojRx5h+quBEhpDjkmbSmX8=; b=hdk2FhknORuv1Hl7JjFnZm91Z9yFOpRTJAGe+ZUWp8S6gkqIg1xFlkhjpwtJCyW7aRT4DH zAg2LfSQtZNoFLP9veSpF4sXRjq/9aR0wqgGIt4JrAUzQHLEH0xP3UPcbrxqm2CqLr+WBF VxVUHF6sCSMQ+HYUbqWS5Nxv4n2M7UiUyvsGcGFJC03fZ37VrHsPf44ORupxjTfAeTQIQQ AiZOnlUXFvfLNYh1IU76P5cWoZEAjk2IOPTv054x5S7VRE0Teu7bG67W3GlgFKfxYz6+Qa vdYnmI47mHDGoWNOW+Yob+wMM7yXe7xGpS3Kd//Xd3GiVwZtMySqbj0AJQSH7w== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=S3J7Eev5; 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.02 X-Spam-Score: -2.02 X-Migadu-Queue-Id: 67D161BD93 X-TUID: 9Y5rtuA/UArv 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. Kind regards Felix