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 6A+7H6eJhWQxUQEASxT56A (envelope-from ) for ; Sun, 11 Jun 2023 10:45:27 +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 GIamH6eJhWTwfgEAauVa8A (envelope-from ) for ; Sun, 11 Jun 2023 10:45:27 +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 3297438A9B for ; Sun, 11 Jun 2023 10:45:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8Ggo-0006ZX-Sp; Sun, 11 Jun 2023 04:44:46 -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 1q8Ggn-0006ZP-2g for guix-devel@gnu.org; Sun, 11 Jun 2023 04:44:45 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8Ggk-00081V-Sf for guix-devel@gnu.org; Sun, 11 Jun 2023 04:44:44 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A0253E13; Sun, 11 Jun 2023 10:44:39 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r7Vpqktm7EnJ; Sun, 11 Jun 2023 10:44:39 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id C6EDB1F1; Sun, 11 Jun 2023 10:44:38 +0200 (CEST) Date: Sun, 11 Jun 2023 10:44:37 +0200 From: Andreas Enge To: Maxim Cournoyer Cc: Christopher Baines , guix-devel@gnu.org Subject: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] Message-ID: References: <168610879676.2825.9044237296073582277@vcs2.savannah.gnu.org> <20230607033317.826FCC23EDC@vcs2.savannah.gnu.org> <87sfb31qqp.fsf@cbaines.net> <87wn0aadrb.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87wn0aadrb.fsf@gmail.com> Received-SPF: pass client-ip=185.233.100.1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-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=1686473127; a=rsa-sha256; cv=none; b=m4BNGk/Jv+mB0UVAXuTk6IALkR4ANX8OjNREyYufxqeAT4JDYOE0DT7JjgiRHVh3SVdiKX azfUYjPKpxZUaJrJP6dHMWHb5rYROOH/93K3iF0N1fuebDCSO9FIzra9tIdS82hlNamPwG 0fPDcYQVi7bUXyG7ZHyKhqZnsivJ5QHzCn9FFXFuStpNQ9dRfTurg9RRBnvm7KCDyVx3qu OrjTwVDCZcKTOzSv/IOXKpS8c5Ds/DeqMWMYJVoy1+LoTx2KIEPsAPajpCgxc+sM2RNbRk LgoxIbMD6QwSkzpE/H+6/SDhZtAC1QGcvOSQ4FTPMLFIDIGr0kaeaXHOqxF81g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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=1686473127; 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; bh=MWJrWCNMErv2BurNXdZ5cQx7LS2Fv4dGoRCkXHBlBSQ=; b=NX82JgKMBt16GnL8Cm84KqCUN2Pm8TVKk62baJfq7Vu7gevH/pgt/kl2OUmJTe45ru8RU5 HdwMtmSYt2st+IBNokEdHUHMze0p7/0ZdUEluTiUYwEQoZKO9DavRfPJUlkPm3/kGNBIBp RKppZZnkejuOiqqEWpX12LM34S3ZZfWOHm+tGjIZx3qeX6j3jPVVHKFIZvWrAYEEuWF9ej GZnX1YLhvxdJrGMQB0z1gRh3Nj9VyrIgYVF4s18z1mth9c7ZPAsmgqwJL3ORJ2HN/qiFmS 9KRGEgC89kpEusxqRIvvnHKBapSNLPg6dqD8apKW5CMafwnQSsCC/kl4+fvanA== Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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: -3.31 X-Spam-Score: -3.31 X-Migadu-Queue-Id: 3297438A9B X-TUID: 7IcS87NLkddI 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? Andreas