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 CERgIQI8hmQtBQAASxT56A (envelope-from ) for ; Sun, 11 Jun 2023 23:26:26 +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 0MYpIQI8hmRr4wAA9RJhRA (envelope-from ) for ; Sun, 11 Jun 2023 23:26:26 +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 1EAC4FAF0 for ; Sun, 11 Jun 2023 23:26:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8SZV-0007K9-WD; Sun, 11 Jun 2023 17:26:02 -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 1q8SZT-0007JZ-VM for guix-devel@gnu.org; Sun, 11 Jun 2023 17:25:59 -0400 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q8SZR-0000eF-TV for guix-devel@gnu.org; Sun, 11 Jun 2023 17:25:59 -0400 Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-6262d8688baso35075366d6.1 for ; Sun, 11 Jun 2023 14:25:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686518756; x=1689110756; 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=JGl5c/nbHPank8NsIhenp7FIfOBjawqGvNH6VQPExPM=; b=ZMUbHYKjqe/vRTAQe1kPXsTBjHcrYtOfXZSRAKRwjU4m7m5ediGr5Q3StqAuRSTL33 vDEfAGCi8MvGKLUItOsQfMl1/gfTdI0OnzPHezbgoLgtGyZ7ZIXOMxb0g7HM+GTW1aw7 k23o4vWP/rdOvNUhg+ooZuKjSs649NI5AETp29m5dqSZfdL32OxJKcMU+1zP0QFp/m5c YLZMviMYmCIbVCjG5a2v7cNLq27kIEy9LQ9rrXd91n0iHUZynBPLao16EbYrycbr4gn0 x/x1T+s001lQhM0Fr8fFlDDk4jLjBui9xV7j0wIXIpBstl7d4lpjMLXcyeRaTYN81G97 txGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686518756; x=1689110756; 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=JGl5c/nbHPank8NsIhenp7FIfOBjawqGvNH6VQPExPM=; b=lcrvvrzFhzckizuf2PPUXspJSu0GEElzzxYWv6+gDbuJmbqVlB3PVdpZDcpzsbVfOj w77r3S0phtHidEa7KiDE/SzHKqKa4rbvNq5V4qZd7YJmT0NtcoXchiMstDKMBd+LL0Z8 RFHVaXVp0ObgW/t/oNp48yQQS0TGq+Nv2ZmipiNuexqwcp8T7czLUQistykSEe0mqGSQ 2/oJBNs4QEbe27GosIGfy7GNupJnQDRCLR1eUZuhF4hHHORHBEXrh44oEoAil9ysQlwg tP1A4IBLFBZtJmjToqPenTooeSy+GU+/6qbRxNwewy4on3tb229wBks7WMEssc4Jyr4S jlDQ== X-Gm-Message-State: AC+VfDxYI/pNZfjVed1RczKFgra0iUxXkzvnHcF6oDB6/GBXwaw4Hv0j sitTNi2UiLgNhZPWmOY3NoTZjgo3OFb6KA== X-Google-Smtp-Source: ACHHUZ7eFP31coZ4+aAtEqjCVvSU5w0mZ9W+blY1TUeGC2fewGEwovj7wGSv4EaHFw1/guV1wtwDoA== X-Received: by 2002:a05:6214:76b:b0:5f7:a9e1:bbbf with SMTP id f11-20020a056214076b00b005f7a9e1bbbfmr9701853qvz.44.1686518756675; Sun, 11 Jun 2023 14:25:56 -0700 (PDT) Received: from hurd (dsl-205-236-230-101.b2b2c.ca. [205.236.230.101]) by smtp.gmail.com with ESMTPSA id u3-20020a0cdd03000000b006263afa6ab9sm424634qvk.144.2023.06.11.14.25.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jun 2023 14:25:56 -0700 (PDT) From: Maxim Cournoyer To: Andreas Enge Cc: 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> Date: Sun, 11 Jun 2023 17:25:55 -0400 In-Reply-To: (Andreas Enge's message of "Sun, 11 Jun 2023 10:44:37 +0200") Message-ID: <87352xady4.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::f2c; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf2c.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=1686518786; a=rsa-sha256; cv=none; b=WeXGY9X0LHq1UQHyLWHCU0zkBJwn/Nk7DntlxZXksz8LCCW6mw3jnBV37t5A7gL17VXTgV 7AnuIaY3o1p5A5vuR1xoOuvkIloxBCV4mczpijpsIbAPbRAGsMlmSQdlEbzL20u78HolZj UTJTqo4REqaN18TCcVs86/VqltEx14b/X5a9MoK7xcTaC35+qRZcwlETVpgmN8TWLZZDR7 GIASOpzmM2IRR2cpBHPNig/vJ+CjqHHVuuoibM1mPcITr9A7DfuOKaXyFyGMpNV9tmGvsV bnRR1AwzKCzvfLZOlwMRbMyIXVzsSxYM8i5/vmsABfihptE+n5rcyrC2suUShg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ZMUbHYKj; 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=1686518786; 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=JGl5c/nbHPank8NsIhenp7FIfOBjawqGvNH6VQPExPM=; b=eCze3sTZGd7eEhd9HGkjOOx4mqQPc6Tq37FvcTBfDyIDMIEpI+mvFPOYgqzuxh9/fcw3He YnnRnIBfY7TwYoEqh+Z8gY1kyiRQp+JAaLtfxKelfgufvu2Dig2OSMNkRN6azx70+m3gG8 zxuNtNKuvfutRYuam7fzbCMEedSrfOY8GvDiqHQHLbYJPkSlPiyK2DMhlKPlOYCxJhJAD3 /7FpbZQdW4HjprtPN3nuDPTYWZYT+uTSE/5gIgbnjfobZjQwyjRDxBMdsT3RQWjY6k2P3A s0X8fKTZPvAyAVGUH32ILLUcFlDIhKsmh8vsHnhG261Nw1OVn5I+n3rkOks2Bg== Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ZMUbHYKj; 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: -11.37 X-Spam-Score: -11.37 X-Migadu-Queue-Id: 1EAC4FAF0 X-TUID: U7bAp5MUTwuu Hi Andreas, Andreas Enge writes: > Hello, > > Am Sat, Jun 10, 2023 at 11:17:44PM -0400 schrieb Maxim Cournoyer: >> > That to me says this should go to staging. >> Correct. Except there's no staging branch anymore. I guess we should >> create one? :-) > > I would say it should go to a team branch; xsystem? > > Regardless of name, I think the idea behind the team branch concept is > that a branch should regroup related changes (as much as possible), but > in any case there should be an identified person or group of persons taking > responsibility for shepherding the branch up to its merge; and for repairing > potential breakage. So we could extend the concept to have a > june-2023-disruptive-changes branch, with the aim of regrouping several > maybe unrelated changes leading to bigger rebuilds (and identified > responsibilities). We should not create a random branch where lots of big > changes accumulate for which nobody takes responsibility. > > The changes suggested at > https://issues.guix.gnu.org/63459 > remove the staging and core-updates branches from the documentation. > Does it leave open problems behind? > > One thing I wonder about is whether we should not rebase all team branches > on master instead of merging master back in. In this way, at least the > commits specific to a branch would be visible since they are on top; with > the former merging concept of staging and core-updates, they would end up > buried deep in the commit history. It could also help keeping changes > focused. What do you think? Rebasing only really works if a single person works on the branch, since it rewrites history. So it doesn't seem very team friendly. Also, 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, but minimizing this to only when it's truly required, as Linus suggests for branches maintainers (where it's suggested to not sync with the main branch to avoid getting unrelated/untested changes). If the branches are short-lived that shouldn't be (common) problem anyway. What do you think? -- Thanks, Maxim