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 aCNTNaASY2YxSwAAA41jLg (envelope-from ) for ; Fri, 07 Jun 2024 16:01:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6DwVL6ASY2ZtNQEA62LTzQ (envelope-from ) for ; Fri, 07 Jun 2024 16:01:04 +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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717768863; 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=3mBOwrUNZdVaeOxcdYQvZ2uTQ+xYkOaqooGnM4ZT4b0=; b=TOPkt+cpOQsQypmI619qDUqnCpYp9D5zSxj+5+IzZwXNOBrwcT4KgR0VVPeqB0cuYiv96H c4Il/pedprG/2IFSoV+cXUHh1Z5dU4SEf2PnmllJJBz+XMI+OBBEqxRYityc6unSf5cPBc xfDQ7u9kQi37vX+/ggA41X5VNlFIfOc2YTbeGUKbeAdMSPP7n1PxT0jyGyOLDf3rFGWxa2 pBEsoUbaNWME7bHTzQcZUo3yO0LmJnCwHpk/VVmtrc9lkdw56TdRCV8e5t5bVTsGeoT+Ve L1CfI4zv3UvScubAdMngY745E9IFMN/iEXBj9ONz7b1/J2Jp7iv1VFqJrU1u2w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717768863; a=rsa-sha256; cv=none; b=pcI1EkwkT+jiFiBhgvCsRNus0XY3FR4PG/ewImv9vKmIvZWFeYejOHn0DgB9cSKz3cUZAU cvMhih8DuC0Fj0cs4a3gOUkyKudar9YSVIuPVMV+IXYTue+l9z9yDBHLRZLes6o1Bzk9YS mVtL8mTC0a6OFBakIl7LD3MYOvAYwHhX9/ZqO6x/1NM60rJhscnwfXbwbb3/qf7pkbxfjI JqEDb+7f8RoEdj0AFFSKO6KXYe35TdRF17BNRLZt8grK2sfK8AM1U3JUEVaqyxcM8BSbTz AgW0Gmtk6/PSDKkZJxUKkA/f2K798LWBiavcI3cyfcjiGOVVXrwUP++QLYeR7Q== 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" 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 1B6B8B626 for ; Fri, 07 Jun 2024 16:01:03 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sFa8z-00035B-3M; Fri, 07 Jun 2024 10:00:37 -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 1sFa8w-000353-Ux for guix-devel@gnu.org; Fri, 07 Jun 2024 10:00:35 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sFa8t-0001Lp-BF for guix-devel@gnu.org; Fri, 07 Jun 2024 10:00:34 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 79A6127BBE2; Fri, 7 Jun 2024 15:00:27 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6ec94bb9; Fri, 7 Jun 2024 14:00:26 +0000 (UTC) From: Christopher Baines To: Mark H Weaver Cc: guix-devel@gnu.org Subject: Re: Cleaning up branches on savannah In-Reply-To: <87o78c98cg.fsf@netris.org> (Mark H. Weaver's message of "Fri, 07 Jun 2024 09:43:00 -0400") References: <871q592ixj.fsf@cbaines.net> <87o78c98cg.fsf@netris.org> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Fri, 07 Jun 2024 15:00:24 +0100 Message-ID: <87sexo26pz.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.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_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 X-Migadu-Spam-Score: -5.44 X-Spam-Score: -5.44 X-Migadu-Queue-Id: 1B6B8B626 X-Migadu-Scanner: mx11.migadu.com X-TUID: JU+mwUf7SH9Q --=-=-= Content-Type: text/plain Mark H Weaver writes: > 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. I think the easy process change is to delete the gnuzilla-updates branch once you've pushed the chagnes to master. That should make it clearer that there's effectively nothing on that branch. This shouldn't cause any problems for ci.guix.gnu.org (it hasn't when this has been tested in the past). More generally, I think this is the kind of change that hopefully could be tested through QA. That would mean sending a patch series to guix-patches and then checking qa.guix.gnu.org for the results. Whether this would take more time or more work is another question though as QA has not been keeping up lately. Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZjEnhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdcFw//WTxLJ9qv1tG3m1zeoNkjsRq5//F1YFz7 8fuYATZHHyGZAQ8WUWnP/HmA6w5XcY/8Yj+M/+TS0Ikgd3BeS5ANqT2v2Z9aNuMu Fm7Q1JPFyG4JjmEweeVcBYjQWnoa5mIYLd06JuIyoRraJxFnsgfptGcyUj0OSyV0 ay94UPRRYAhQlL1K8HETwQZ5WKiVlArXDpW1RUCwmDkZpx3sJjCwaBvaVXe6prH4 /1yd5zsK8frPV34qaTNhyhW2cIbLl/VXyWUVW99qGI8wossnNckpHYGpsidTbELV /YaDgqwNaXzVFUx5GFMdZ75L3d21lqIoFBO7Luf9BfQng7B7k/nh4Vu/3kxuwreL cw/aOZrQSu/d6TsayzSURSf7xp8jIZrvfn5svuP5+es7fKuszceDQnczlvlfA/o1 8O1UD8nhuBYe/QUr3Dlo3o1CAkBTk6rjbGA1vVs0HH9hTqOZccJ5tc7TNd8DCR1R 8TgXqdsiok+WIrKyJfAMVMuXddJBhiAKfh6aNF5q44ruiWXf+H0jZT/rGVCMnuiA SSK9QPndiiPgR4J2EPy5U7KsU6vBNBWFTjhSypHHfFctVHA6u5a5ttmAztHiwaFR fhROWeOqC/0KG5efep6+bE8oAQiFvH/JjhDZOaSa0sOcZsA5yK/Q0Ywzv3qsiovw znRJE8a8EvI= =U2YV -----END PGP SIGNATURE----- --=-=-=--