From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 ICJSOeNRoWTWwQAASxT56A (envelope-from ) for ; Sun, 02 Jul 2023 12:31:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id cCI0OeNRoWToqQAA9RJhRA (envelope-from ) for ; Sun, 02 Jul 2023 12:30:59 +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 AF88436096 for ; Sun, 2 Jul 2023 12:30:59 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFuLY-0005Kj-0t; Sun, 02 Jul 2023 06:30: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 1qFuLW-0005J7-Ek for guix-devel@gnu.org; Sun, 02 Jul 2023 06:30:22 -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 1qFuLU-0008Ae-5z for guix-devel@gnu.org; Sun, 02 Jul 2023 06:30:22 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id C769C212; Sun, 2 Jul 2023 12:30:13 +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 L81L-W5JDXnh; Sun, 2 Jul 2023 12:30:13 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 975451F0; Sun, 2 Jul 2023 12:30:12 +0200 (CEST) Date: Sun, 2 Jul 2023 12:30:09 +0200 From: Andreas Enge To: John Kehayias Cc: guix-devel Subject: Re: Branch (and team?) for mesa updates Message-ID: References: <87y1kfqphd.fsf@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87y1kfqphd.fsf@protonmail.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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688293859; 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=57FE1hLoC4ZIu0qZi8XFEtiPIH9+SUqCSctHfrK2SMw=; b=I4903xFtrw0I5CuUYbqdfGmGkqg85OeM8JdKkCMPTVF4kjFcy4TW68ba4vmMoEzvLaQrUd eCMfkJDVb9ExW1kxQk9GRtSMUe2ZTmqQO0hbbzSOswnsRoCHMwX2WedESjIefqI4Jev7Ie 6Q9KWUL/XDt+glEExuIrKgyLW8/lDVirLStc2DC6SDAKSx3ciYe1M0hke9WV/OagqjUzDJ GS5I7RsfMLsq7llvDiWw33QX0257GitBXlEHL1yNF4haPFyWmYwoZao/GME9BV5Vg8bPma gbiOALZliFT7FiI0izzeUijv+vAPkDeFZFTVqxVm0kZdJHuAlJWXcHFzjs+RFg== 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-Seal: i=1; s=key1; d=yhetil.org; t=1688293859; a=rsa-sha256; cv=none; b=jAZvYCCw9wL2oHIcUPCpxn3OHB3q49YUCqGne4WWtBqsXC63P1VClT5FBAzK5rf78a+UI8 /uD6CCGaOTRob0y6rjMakryUeuJjFqTcSTDfQ3+qY2thRD2jQtVQuyvT55FMdb006XFB9R xG4F2KoPSx44LCSKc6Qm6LLplRGtEGjaKWa49gnpTzvBkV37BM7m8YU+vB9xbG84yqu5QZ 1S+shSV87L5oSbEEHLJbyLYfjNkHyh4+OcOrXqrMQzXy/JTk+GjBslyBSeOqADpJbv+XGy 4lVXtYD7tD5MOnYgZMEytUpfksCNA68/2z1u/5W7ayDoeaQBsYvYamDR/PTwZw== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.05 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-Queue-Id: AF88436096 X-Spam-Score: -1.05 X-TUID: CnFdwEf21mPI Hello, Am Mon, Jun 19, 2023 at 06:25:04PM +0000 schrieb John Kehayias: > Master can be merged into this branch just prior to a patches going to this branch with the expectation merging back to master will be soon after and changes are only affecting packages that won't be touched on master anyway. I think this should be relatively clean and straightforward, a good use of our new branching/building strategy. I am a bit wary of branches just sitting around; after a while we will forget whether a branch still needs merging, or is just a placeholder. So I would suggest to delete every branch right after merging, and then branch off of master later when a new patch is going to be applied. This will also create a cleaner history by avoiding a merge. This is compatible with how cuirass works. We can keep the mesa-updates job, and when the branch does not exist, it will just do nothing. You just need to be sure to use the same branch name again next time, and it should be picked up by the cuirass job. Andreas