From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id iNi9HTxiW2TmbwEASxT56A (envelope-from ) for ; Wed, 10 May 2023 11:22:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id gNLgHDxiW2RoggAAG6o9tA (envelope-from ) for ; Wed, 10 May 2023 11:22:04 +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 428698ACF for ; Wed, 10 May 2023 11:22:04 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwg0k-0006yX-IK; Wed, 10 May 2023 05:21:26 -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 1pwg0i-0006y6-3d for guix-devel@gnu.org; Wed, 10 May 2023 05:21:24 -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 1pwg0f-0002fN-Jr for guix-devel@gnu.org; Wed, 10 May 2023 05:21:23 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 8CB495F0; Wed, 10 May 2023 11:21:18 +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 W4d4pU79l-D0; Wed, 10 May 2023 11:21:18 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id C2A1A1BC; Wed, 10 May 2023 11:21:17 +0200 (CEST) Date: Wed, 10 May 2023 11:21:16 +0200 From: Andreas Enge To: Maxim Cournoyer Cc: Christopher Baines , guix-devel@gnu.org Subject: Re: Feature branches Message-ID: References: <168347913021.32190.10808857919894440138@vcs2.savannah.gnu.org> <20230507170531.26A00C22F14@vcs2.savannah.gnu.org> <87r0rrzjbr.fsf@cbaines.net> <87jzxjvxeg.fsf@gmail.com> <87ild3yltb.fsf@cbaines.net> <87v8h2vpdq.fsf@gmail.com> <87bkiuvju6.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87bkiuvju6.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-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683710524; a=rsa-sha256; cv=none; b=MnZvKLhlmu7v6on7XsrE8EL0e2kVODLpiXc8NNatP7K8btOpfsd94eopkGHGTaovuHbz7S wOFGUj82kYl6mc17WKGjfqudGKKVCL0lR2GOLXSkuXiJEr72PhPdC3Vt8LIXSDlZuKApBg dN7SGhEJa6uczD/v79OUCRaTiMYmkaXfqyQeyOGfQEy46Usr0ZWMFxfk9IaVaFSzJApFBZ D8vwfv8DHXy8nOt5O3rn4gWZu7cBMPwYbKWp9bMjv5Ud1FPvPKBUP5DuSsT6hfy0Mtkoei 5AKVCavmnaAfWFC++b2AERNo6trQ8Ds+snQWwybBgaY4xDh4WYUw6lLpWb7p6A== 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=1683710524; 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=4VHjsLSPuKj4LTL34XMryMfpWuCihTave17mRthDAb8=; b=Hyze5m3439Y/xkgO3FGDegCpCcoQvR57ejba8CTG+3EBPWf6wY+y/Tg5OVx4MDmPyJnkrs pg/IkJNOLujuwS9cLMXMWsQWppXvalkAOy26xwVLYheRF62Fxhn04DgFSgA1u5XM1BKO0R ZspNuksephszBF6OWDq0uB9aO4bVvC2JMkVZJLj1WjuS4wO1fM0m5FPebhs+ednOvYYNwQ XpOgHPHAhl0VEAPZ6VlNJAKv1Iu7fQEFy9hkeXjnXxobJY+yBqgjgZM/fruZLrwB6LxyLM FvbjbRlSssEmyqJXGEv8pHjlRiEpmw2nv3KZdJqa6ThOjOX0R/ioaJOchNOTiA== X-Migadu-Scanner: scn1.migadu.com 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-Spam-Score: -2.48 X-Spam-Score: -2.48 X-Migadu-Queue-Id: 428698ACF X-TUID: xAUsPSDNDHYz Hello, Am Mon, May 08, 2023 at 01:01:05PM -0400 schrieb Maxim Cournoyer: > - I'd make the team branches permanent; e.g. the 'gnome-team' branch > would always exist, and get synced periodically to master (when enough > built/deemed stable). This should reduce the overhead of constantly > having to adjust the Cuirass specification jobs and serve as an > integration point for the team (the Cuirass job specs would be defined > declaratively in the guix-maintenance repository). I would argument the other way round :) For instance, I would now remove the rust-team branch so that it is clear that currently there is no work on rust. As soon as there is again, the team could spin off a new branch from master. This would avoid having branches around of which we do not know any more what they contain, and whether they contain unmerged changes. $ git branch -a | grep rust remotes/origin/rekados-rust-queue remotes/origin/rust-team remotes/origin/wip-cross-built-rust remotes/origin/wip-rekado-rust-team remotes/origin/wip-rust Can any of these be removed? Or brought up to shape? Notice that this is independent of the cuirass specifications (I think). I think we could keep the specifications on cuirass, but am not totally sure what happens when the branch does not exist. Probably nothing. And then it should be picked up again once it is recreated. > - branches judged too experimental to be merged into their team branch > could be branched from it, with a name such as 'gnome-team/feature-x' > to make it obvious where it should be merged when deemed ready. > Cuirass job specifications for such short lived branches would be > created manually using the Cuirass web interface (users need to be > authorized as can be done following > https://issues.guix.gnu.org/63375). > I don't think team branches should be merged together at any point, > ideally, to avoid loosing the benefits of feature branches (limited > scope). Agreed, if we start branching from branches and merging back, we will probably lose overview. With my take of not having permanent team branches, it might not even be necessary to branch from team branches. Andreas