From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id aEmUN+QqCGbPLwAA62LTzQ:P1 (envelope-from ) for ; Sat, 30 Mar 2024 16:08:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id aEmUN+QqCGbPLwAA62LTzQ (envelope-from ) for ; Sat, 30 Mar 2024 16:08:20 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711811300; 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:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=XLIw1ELJyyTXOkGKbhqJo8ERnkdECoe1HwxVbYHtizg=; b=DCsEPpXFKmTcvZklqsDwIjG00RQht2oX4k2LM3BTQNgqhLCBI6fxCJlIaHik9kIJ8TZ687 dskxI8iUrGcWGKzqxTS7fkk/Yuout8+tjCHWwfoGi0IEcxSs4Y3oovOpq13K7t56yvGNhY HM9OaHseq0IcUSwXrN8YgTSZoiEtf71zcHcwen0g+dm9hKNSeeclVPkacbSEHDxaWDQl5I FNbQ0VSbH2qLnTlltl80JJzhg4X8A+bhFkTBG6XgDXJdG5W8C4PI1hMLGSkzda+rRazdTC cIslPmqQCh3go6LNf4iu+tuv9alxMKug9gTBnYpUZ80QFFmv6h/o1E1peI/HXA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711811300; a=rsa-sha256; cv=none; b=UN+FM7uAtn8/ncP9iQrPm/LPzq7pbcTkNQ+0FA+zdLo1B+eSxv92cbPG2uJ/ueK9vwiJz8 7UDNGtjZxDhYfrps8DACy+IIKfLygqbptJ7p2QttMQQrpu6XYeqN31Lr7diloYMBCzWFM2 mbYJoQg66I5/rTrqjv+HF23n2fvhAINmNnBWpooAYUMMNAq9yO1ilmquJ7uTVWncnUqKM5 xkksfGyczsdf4/xDQVL/1yj/DVwdFh1S+F5XB7La88yxwtLZqd8THHEWyALNjC8v5I38KQ XyStyYCh2l8Zg/DNdEKSI3G3rGMIMade9mY282mW7OxEM45xO6++SF9ge0C+0g== 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 B65B96233E for ; Sat, 30 Mar 2024 16:08:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqaJQ-0005Md-Px; Sat, 30 Mar 2024 11:08:04 -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 1rqaJO-0005MG-Ld for guix-patches@gnu.org; Sat, 30 Mar 2024 11:08:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqaJO-0001cf-DB for guix-patches@gnu.org; Sat, 30 Mar 2024 11:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqaJP-0005P8-VQ for guix-patches@gnu.org; Sat, 30 Mar 2024 11:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69414] Emacs and Gnome branches are merged now Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 15:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69414 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Liliana Marie Prikler Cc: guix-devel@gnu.org, 69509-done@debbugs.gnu.org, 69414-done@debbugs.gnu.org Received: via spool by 69414-done@debbugs.gnu.org id=D69414.171181127720683 (code D ref 69414); Sat, 30 Mar 2024 15:08:03 +0000 Received: (at 69414-done) by debbugs.gnu.org; 30 Mar 2024 15:07:57 +0000 Received: from localhost ([127.0.0.1]:46019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqaJI-0005NW-NV for submit@debbugs.gnu.org; Sat, 30 Mar 2024 11:07:57 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:34017) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqaJG-0005Mc-6n; Sat, 30 Mar 2024 11:07:55 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 118BD27BBE2; Sat, 30 Mar 2024 15:07:51 +0000 (GMT) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 732ff711; Sat, 30 Mar 2024 15:07:49 +0000 (UTC) References: User-agent: mu4e 1.10.8; emacs 29.1 From: Christopher Baines Date: Sat, 30 Mar 2024 14:20:38 +0000 In-reply-to: Message-ID: <875xx3sqpo.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -6.95 X-Migadu-Queue-Id: B65B96233E X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.95 X-TUID: KHRu0TMBLVmC --=-=-= Content-Type: text/plain Liliana Marie Prikler writes: > I've now pushed the merge commits for both emacs-team and gnome-team. Thank you to everyone involved in getting these changes through :D > If you have a weak machine, PLEASE DO NOT PULL IMMEDIATELY AND WAIT FOR > CI TO CATCH UP! Despite efforts to prebuild things on the respective > branches, the merge commit carries with it a rebuild of the most nasty > package to have to compile locally. I've had a look in to this as it would be good to work out how this happened, and how we might avoid it in the future. I had a look at QEMU and gtk, diffing the derivations from the gnome-team branch prior to the merge to the master branch after the merge. QEMU was affected by the usbutils update in 855fecf00f7df8bf878a8ecd47800ea9bdfebea5, which was pushed to master on the 26th of March. For gtk, it was affected by the psmisc update in a2d82fbec4254cf6127b15aa3e827d22da235c30 which was pushed at the same time. I think the last merge of master in to gnome-team was pushed on the 20th of March, with the merge of gnome-team in to master being pushed today on the 30th. Looking at those dates, it seems like bringing changes from master in to branches more frequently, or at least just before considering whether it's ready to merge (and merging if it is) would help to avoid this. 10 days is a long window in which changes can be pushed to master. QA is meant to pick up when a branch has diverged from master, but the mechanism is crude and the threshold it was using was very high. I've now reduced it [1] so QA might warn in the future about this situation. 1: https://git.savannah.gnu.org/cgit/guix/qa-frontpage.git/commit/?id=b1d7225636d7c1946f4718d6441a621d51f8cd6a While I don't think it's directly relevant, I think it's worth noting that both changes mentioned above (usbutils and psmisc), we didn't follow our own guidance on managing patches. psmisc affects more than 300 dependent packages, and while I think that's less of an issue if changes go through QA, I don't think either of these changes did. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYIKsNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeixQ//U74Hgo2UpBAfImHe7Ws8zirmYisQKBPy V7+N5E9KcgW87DMi5sxuuUOp+5q3f9sp1Ip5q1ZHC3tImju7fPosDO6azxdgzmw9 uZ2Tfgr4X8bAy5SMqEjv7PURAVDp3OJnvI/nWlMD/vDJBtY7VUQnYtwrCWfjuaK6 hVrdlgEDVoxmc4q7N/xQKr54rzk/h1XnCWtkM7hVzvSMph/WE9SL2n61IaNlD39Y dZsuOkpsga24tjsQSeXWdXwm8cLH+qj1BT06Khn5DqyRfUfEm142hTXDVnzd98/b jnOlMjS86obTdYCvsAgYW54IBhV1tfHMQOU77/8M4MPoc86rkNU/AzE4MkY7GNU6 tFkMPa3jXDVLFmRlmBQ2DN+W2PQyW0rZp0tSECB7JBz5oL4/2i0gMI7J/Dakix3Z fdnl8alhEfXfy5akDm/7I6Fn07ODEriLMJ9l91ueQkaB6x92XrpVxbw3kxLW+ZDm ojvYh7QbP26OzULNCTd6Hk1cvU7h5Lc9CqSUnSw8UgqlonNgizeUsJPwEZ+vErVt utT+ppQipDFgjFb9TB5aaqJQqk6Vkl/5cwlKHXdVahFeMgxUkQ7o6iJ+U/HjvzOf E7hcHUtoCQbIe140SGPwNCgPHr4zi2fooZO1edvT56r6jTGb0B1Q2nH/N5XKZEez uIXLmCqHFIo= =FwrI -----END PGP SIGNATURE----- --=-=-=--