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 KPlMHqeQpWS2TAEASxT56A (envelope-from ) for ; Wed, 05 Jul 2023 17:47:51 +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 aI9OHqeQpWRGMwEA9RJhRA (envelope-from ) for ; Wed, 05 Jul 2023 17:47:51 +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 36A6336269 for ; Wed, 5 Jul 2023 17:47:51 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qH4is-0004fh-Mt; Wed, 05 Jul 2023 11:47:18 -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 1qH4iq-0004fR-PK for guix-devel@gnu.org; Wed, 05 Jul 2023 11:47:17 -0400 Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qH4ip-0002R6-EN for guix-devel@gnu.org; Wed, 05 Jul 2023 11:47:16 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1qH4il-0008UV-UH for guix-devel@gnu.org; Wed, 05 Jul 2023 17:47:11 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: guix-devel@gnu.org From: Katherine Cox-Buday Subject: Re: Branch (and team?) for mesa updates Date: Wed, 5 Jul 2023 09:47:06 -0600 Message-ID: References: <87y1kfqphd.fsf@protonmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US In-Reply-To: Received-SPF: pass client-ip=116.202.254.214; envelope-from=gcggd-guix-devel@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-0.089, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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=1688572071; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BkgNorwKGKjJJjTijh4spbhkPlge9oISCgsP62CPI1o=; b=tgXtM3mZ0nACALMfw7d+MZ45Zkka/4j8Cf0rAPjFsZU3oncZ88G1aZ4Ue7y6yBIFf08jX9 NJyv1LItF7pr92QwIy8WLqIhLdfhU0jHmZY7XdsZycSAdu/onYyX+jNJvjiZTchg4/DtqM //yUqv5ayoNVXhvfs5/CXqMSDEXQ4zLH/DZlYuzr0L8gKerDxFaKidAEX7sHUNHcsaYM1N 91e7N6UWkiXITf1YGt32QrNLhzEPeDI8mzH005TQlqjJPpHyu03RIWQNPP9yCO4CsAlDIO IDk8TbahVDMDDXOSQkcU9rImJZXSEPMvpukByzLP+2ilxNiHKocCaahkIx5jBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=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=1688572071; a=rsa-sha256; cv=none; b=FT7izoL9LuaG5Pnk6Zlgx3NqTsxWByZeawFFvaErpMAjgl4l6m2ukWgcwhbkWirNKycsk6 DW9sMwwGZnq3uRby8ie42ELd2mXohO93HDaGtPbmdJ7AClbsyERwyAyrnqdjA1Y2OFTXGT HcgBTOYC5q1mpgwReeLA4H1O2hEl3FbttkmDQdzq9jv08UXOVrKrFDgwA4UEcMNuuG97u5 ah41oUfF96kDn17yxWc+2oHMfZZF9O6uA7q5UTWn2uYeYmLggWE0F3emho9ifD1MnmvgkF hasFQR0T5odN58UG50NYQ8xStODQD5cC9dW4y2F5WfLVaH3lfpKMrrERwM1Dsw== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.47 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=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: 36A6336269 X-Spam-Score: -2.47 X-TUID: ZNy/Oox0xoRY On 7/2/23 4:30 AM, Andreas Enge wrote: > 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. I disagree with this because it seems like Mesa moves along at a pretty brisk pace and I feel like we'd be constantly recreating the same branch: 23.1.3, 2023-06-22 (14 days) 23.1.2, 2023-06-08 ( 9 days) 23.0.4, 2023-05-30 ( 5 days) 23.1.1, 2023-05-25 (15 days) 23.1.0, 2023-05-10 And so on. >> 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. This seems more reasonable to me and like it's standard Git practice.