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 KB1SMd8ZiWQRHQEASxT56A (envelope-from ) for ; Wed, 14 Jun 2023 03:37:35 +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 cAcqMd8ZiWSSvwAA9RJhRA (envelope-from ) for ; Wed, 14 Jun 2023 03:37:35 +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 53BDE25474 for ; Wed, 14 Jun 2023 03:37:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9FNo-0007QM-GH; Tue, 13 Jun 2023 21:33:12 -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 1q9FNb-0006zc-Jk for guix-devel@gnu.org; Tue, 13 Jun 2023 21:33:02 -0400 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q9FNY-0006kn-2S for guix-devel@gnu.org; Tue, 13 Jun 2023 21:32:58 -0400 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-62dfc2da0c8so7665586d6.1 for ; Tue, 13 Jun 2023 18:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686706372; x=1689298372; 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=vYquXTn0joE+IQewfs/Baie4tTslRnOP8rGos146ZXc=; b=IaQ3QsNzRFvSJ/mtvAGrOTb5LCvqukMBrIB3kiiwI139TGKSSmsK6euO79iA9oiC+b DSDW3NuaV2ukUvLTtbHZXWu/CIvaMyL79JUHMoESvegkAq5xpFZjBSxlMkLov2JUwdwr +B5384salIt3XvpI+hehi0dmgryz9ld6mS/WkweMDcckAFMUbKZPapNrF6lzJKvkPTUD Spdnpi8rE0+0rlNbk0xo1CL0530sNpl5FYADowZX3hwp0QW1p4Sjd5s+Wt+Sw9l17jlM URSgMU0HQQ0lzqRBMMHsoKi7USBmhhmSilwyUgnBmOdwMz4BLjj/OEA+otZyNIL7SDtt Ge+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686706372; x=1689298372; 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=vYquXTn0joE+IQewfs/Baie4tTslRnOP8rGos146ZXc=; b=d6vr+b7/b4a37q+cA12x48qHhjBXyYk8WFW29+PapSUgbNtpP0RFme0dokbBmtpTh+ htcwK0L/jYHHLVd+mtValmjXvw4cFXaLUUc4IPOxqOwaLFEk+9zxfmM+6jwDzW+eRRTY /yoYq/e8wNTXyDXMYucHmI2MMhnudBuggKsPyemJ8hqKlcKaK7O8a+j6QB+5+WV95kiZ 6JjJJj66oPYlH+2gNaOu7+u/2eTKhZ3ipiYswtbDvF0HOsljDiTOQMfO/D1EWkhIDMf6 Onu45MM4hqlidsAPHHmz4Sq719k+bDYEsNx6biwkJPPETh4Mz6S229dwcRqZS4LSK3at 35vA== X-Gm-Message-State: AC+VfDyEi4aDbw1eappkAMUHGJ/afY3AQXa2mxmYfpKWCQAQz0/0ujHk HUDFDZT/r0FMao9zdFGB8JtfFko0ddHhig== X-Google-Smtp-Source: ACHHUZ7mHmtGILQXTHxbCjN5UzTaSzPfWw87tz4p/I1+hl+VjDCpNbRiorr9SEJcflj9fiAPaLwV5g== X-Received: by 2002:a05:6214:2625:b0:62b:5786:32eb with SMTP id gv5-20020a056214262500b0062b578632ebmr19025032qvb.38.1686706372049; Tue, 13 Jun 2023 18:32:52 -0700 (PDT) Received: from hurd (dsl-151-174.b2b2c.ca. [66.158.151.174]) by smtp.gmail.com with ESMTPSA id c18-20020a0ce152000000b0061b731bf3c2sm1907854qvl.80.2023.06.13.18.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jun 2023 18:32:51 -0700 (PDT) From: Maxim Cournoyer To: Leo Famulari Cc: Felix Lechner , 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: Tue, 13 Jun 2023 21:32:49 -0400 In-Reply-To: (Leo Famulari's message of "Mon, 12 Jun 2023 22:07:08 -0400") Message-ID: <87cz1yx1z2.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::f2b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf2b.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=1686706655; 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=vYquXTn0joE+IQewfs/Baie4tTslRnOP8rGos146ZXc=; b=gwDb1jyUwIfc6yQs3PujFcpH0c+VBhYscR7jpJGAuPWR0MKaRBSs0BnkPCngTY15WBX6gV RKan6TlfyGwHHW3rlYgHar1G5KEyv2+NiEGLaFuGugGaLZzPvFtsE/W/8360qARC2FNpgc V5ve3zdDBdZyi7EhjZOa4h/1CyX9+7zvzFQcHH5bcJE2sY7A5XUj94cnazwPVOLSfGkQ9G 9dPgMfYzxmTBPPvinHRUc3Q1As3+Bi4oOdK7121aY2GYfZ85XRKfAfKh2FzN6NJe6TuKN/ wVUnYeLOApqLhoKGZEyiaaRXBXHe8J0ZnR9x1fFyPmXL2/sDWdfT61uOb+QF0Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=IaQ3QsNz; 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=1686706655; a=rsa-sha256; cv=none; b=Yfc058CFzNfjXbHNnjaIxidlK0cP7wtz1Nq8dzGIPrnHbmb+VGXo/BDFtbrlfKvrv6V9cf yp0cy31z0pheP5PfL5Cw8acwaJc+EDW2r2Wl54dM4vNQAyszSoo9kMbtjO3fa3zR0NkXvb cSkewk5eLLXNxmAjUtL3zXPLDsgOiRvh6HJhzSOU14NsBuqLDrIbY7M2K43q0dJRCDbHKY L0qPmtvIKSFeQMYeowduk4AtwCMWoi/XzSx8loFj48CytMh4zBU5as4iU+Vz8pYNphWz4P 3piZYEO/twbEc+W9iF5vOvS9P5vUWKh9IuGPbEuDyOgh4Ukwm2+HdsdDR67xEA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -6.38 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=IaQ3QsNz; 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: 53BDE25474 X-Spam-Score: -6.38 X-TUID: O2ScgYe7yGSd Hi Leo, Leo Famulari writes: > On Sun, Jun 11, 2023 at 08:47:54PM -0400, Maxim Cournoyer wrote: >> 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. > > Is it so bad to re-sign commits on feature branches that we should lose > the easy-to-read history of rebased branches? It's no the end of the world, but if it's avoidable, it should be, in my opinion. A bigger problem with rebasing is that it means a single person can push changes to the rebased branch. As discussed previously in this thread, a good policy would be to suggest avoid *both* rebases and merges during a feature branch development. This way we avoid both problems, and if the branch is short lived, it should be bearable that is isn't synced with master for its short lifetime. -- Thanks, Maxim