From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id iOZFAEsOY2YYFwEAA41jLg (envelope-from ) for ; Fri, 07 Jun 2024 15:42:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id cBVROEoOY2a0DwAA62LTzQ (envelope-from ) for ; Fri, 07 Jun 2024 15:42:35 +0200 X-Envelope-To: larch@yhetil.org 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717767754; a=rsa-sha256; cv=none; b=ZoZC4EzAAzhmRq/4Fp0gLqRoTSk4XU/Gq91OIPPhTuYodADA6GjggzhSk/1dtr9EGALLCN QHQ6BWA3cAhKWttO+lCppeMHXha0b4/YtCZP/ikakeOct+9uz5tAkVYDxZLp7iLHdR/as4 iPilMGBeUODG2SJIGsGfpQaSQXpvsgMTzq2FX06ukp0W7ErKVcue4jp0g8xd59x1ayWaBQ G478JnJYjbCrVQTR2dScw/D6GWywwibKj2Kk+dwtNDfjIbSa3jENVUGi/SVJ+zS8ybgmVm spMUSOMe0t5uFrFqNi40PN6lcWxRiWWEkODTpZqpDfbJYYTDaMMdJ8SuLSzUMA== 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=1717767754; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=fVKaJ61vmNpSw1QTFm27k22JG1Aw+6OsY2mkcCmvvMg=; b=sS/1+T+KAJS96Ig+TVD0UtT35SjM8Sv4J9oVctr/5purobggo9LW/oW0U6pjCwapCngUuS WyOEgxfzTYJPtKWS6osXpSZzZ576pf5l7VG09ewiAha+r4y7gDLr8XZ9uBJolKoMphSXHp ZrUipT18RV9vMYmq1iASsKrp69k+yFWIgSM5VO6We2zSCFDXf6lLGKo031gYaTe4KGkkj5 pQM3v7v+0aUSWY4a+k06n9vkRb1kSvjLdFHn92LcV63qTD2x3rvqXlywHDx4rNDekYz/CD uaiWaAavQAd3jHGpWEvyGjp16YoXkCSoBSl3PgkDV1KeJWA2n1/zzhamDlZc0g== 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 8F4621A902 for ; Fri, 7 Jun 2024 15:42:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sFZqx-0000qY-9L; Fri, 07 Jun 2024 09:41:59 -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 1sFZqt-0000q6-Df for guix-devel@gnu.org; Fri, 07 Jun 2024 09:41:55 -0400 Received: from world.peace.net ([92.243.26.228]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sFZqr-00063J-At for guix-devel@gnu.org; Fri, 07 Jun 2024 09:41:55 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sFZqY-0001AY-Jx; Fri, 07 Jun 2024 09:41:35 -0400 From: Mark H Weaver To: Christopher Baines , guix-devel@gnu.org Subject: Re: Cleaning up branches on savannah In-Reply-To: <871q592ixj.fsf@cbaines.net> References: <871q592ixj.fsf@cbaines.net> Date: Fri, 07 Jun 2024 09:43:00 -0400 Message-ID: <87o78c98cg.fsf@netris.org> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=92.243.26.228; envelope-from=mhw@netris.org; helo=world.peace.net 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_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 X-Migadu-Queue-Id: 8F4621A902 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.34 X-Spam-Score: -6.34 X-TUID: gu8GIGhlQ7Nh Christopher Baines writes: > There are quite a few branches on savannah, and it would be nice to > remove them if they're unnecessary, at least because that will prompt > the QA data service to delete the data, saving on disk space. [...] > The following branches all seem to have commits that haven't made it to > master yet, although I haven't checked if the changes were applied but > just with different commit ids. > > - gnuzilla-updates The changes to 'gnuzilla-updates' were applied to 'master' but with different commit ids. In general, whenever there's an update to IceCat, which typically happens about once per month, I delete the 'gnuzilla-updates' branch and then immediately push a new one that is current 'master' plus the untested commit(s) for the IceCat update. This triggers the 'gnuzilla-updates' jobset on ci.guix.gnu.org to build the new IceCat. Later, when I'm satisfied that the new IceCat works, I push the update to 'master' as separate commits. Usually, the new commit(s) on 'master' are precisely the same as the ones on the 'gnuzilla-updates' branch except for the commit log message. If there's a better way to do this that does not entail much more work for me, please let me know. Thanks, Mark