From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id oE18NjiDImZ5CgEAe85BDQ:P1 (envelope-from ) for ; Fri, 19 Apr 2024 16:44:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id oE18NjiDImZ5CgEAe85BDQ (envelope-from ) for ; Fri, 19 Apr 2024 16:44:08 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-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=1713537848; 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: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=OVXYQGmlSfA0cdvgMrNrWqj/+Lm3Uyd8oexXrzwx9tg=; b=hGaeJwrdxs7FpU3kI7fvjIqq03jga199mUX7fnUzsMwdaitMro+dWdwwaTEToBSH/cSXE0 +Jt30mnt/BDUguJe4FhZ8YS5wyRlWjZvXi4Upuq7kVIpC9wwIePIJf1eLYic3xYeOyFXrI QhKuZhCA94ZBifuwlW4/VEJ102MGlLndGXzFmN8kH03G8ZHhhkd5yGAzMBfeolLE3Bpx5O kXSNXRpZqKZQOiWdygM8sQu1B4PlHCJxt7GxDA8ShNO5TLqQALah06+Yn6vUh3jMi+Nw62 7uYznQhxYkpVzIEeJlN9aTFACSkAFR4Gj9ssjkpd8mW+mijx8UBcbYGzviOE8w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713537848; a=rsa-sha256; cv=none; b=nr+2kf+DZdza39np75br4tEZ00Yv0Dym5+D05rpPcw/+9PqLPTUJPttpa23EXBrdgOhIbY 6lyqud1dRZRa7tZaeTKZLZvpq47YOOaIqXfinnhjIvYKUT7hyGJihEP2nSfatY+HHvkBNX xQfIrP/b6D5QatpeHvwd8Q/sQ/UHy2Czaf8eHY/6IycK178oU429TqX1hmD3vns9QqYg9z hkVDkEfw34DOy3aRdsgnVTrA/lgngHn/Jlip0wPLLlElx4RjbgN5gedg6Apge6V6mGY0g3 70bNrdTSu9xWVplCAmIQ9nibvLr6LBaJd4jQaReJPfUp6MKU3qQg00vyuFXHPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none 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 9C62C61216 for ; Fri, 19 Apr 2024 16:44:08 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxpT0-0003KV-D4; Fri, 19 Apr 2024 10:43:54 -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 1rxpSx-0003Ag-Th for bug-guix@gnu.org; Fri, 19 Apr 2024 10:43:51 -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 1rxpSu-0002RR-Nn for bug-guix@gnu.org; Fri, 19 Apr 2024 10:43:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxpT8-0001Ro-7l for bug-guix@gnu.org; Fri, 19 Apr 2024 10:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#70456: Request for merging "core-updates" branch References: In-Reply-To: Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 19 Apr 2024 14:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70456 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 70456@debbugs.gnu.org, steve@futurile.net Received: via spool by 70456-submit@debbugs.gnu.org id=B70456.17135378015293 (code B ref 70456); Fri, 19 Apr 2024 14:44:02 +0000 Received: (at 70456) by debbugs.gnu.org; 19 Apr 2024 14:43:21 +0000 Received: from localhost ([127.0.0.1]:58550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxpST-0001NJ-2X for submit@debbugs.gnu.org; Fri, 19 Apr 2024 10:43:21 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:59583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxpSR-0001Mp-Cl for 70456@debbugs.gnu.org; Fri, 19 Apr 2024 10:43:20 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 6977127BBE9; Fri, 19 Apr 2024 15:43:02 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ad274a19; Fri, 19 Apr 2024 14:43:01 +0000 (UTC) From: Christopher Baines User-Agent: mu4e 1.12.2; emacs 29.3 Date: Fri, 19 Apr 2024 15:42:59 +0100 Message-ID: <87il0d4dn0.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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -8.43 X-Spam-Score: -8.43 X-Migadu-Queue-Id: 9C62C61216 X-Migadu-Scanner: mx12.migadu.com X-TUID: U/tSi7ioQ+KB --=-=-= Content-Type: text/plain Hey, Thanks for raising this issue Steve, given the branch has been going for around 9 months (since [1]) now, I think it's well overdue to start looking at building and merging it. 1: https://lists.gnu.org/archive/html/guix-commits/2023-07/msg00332.html I pushed a single commit plus a merge from master today, and that was pretty difficult. There was plenty of conflicts, and I probably have resolved some wrongly, and there's potentially some things that Git didn't raise as conflicts but might have broken with merging in master. I'm also really confused by what commits appear to be on the branch, take 12b15585a75062f3fba09d82861c6fae9a7743b2 which appears to be one core-updates, but it's a duplicate of e2a7c227dea5b361e2ebdbba24b923d1922a79d0 which was pushed to master. Same with this commit 28d14130953d868d4848540d9de8e1ae4a01a467, which is different to f29f80c194d0c534a92354b2bc19022a9b70ecf8 on master. Putting aside the functional changes on core-updates, it's doesn't seem good to merge these seemingly duplicate commits on to master. I'm not sure how this happened though, or how to fix it. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYigvNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfdZxAArvvJgyEIeZjJZDMlwXDoK9XGfXP0++rV NCjtbfa7hOFWA+hexPDIJFQEdYAw/uHeRMTja1pPHAB7sroTMhLtNbAMhW+FdPpi bl9iB3jMdvXXnbOFo3+wPBBls4Utaoklckj/gqEgSjNyAKdYfKO+IkdG0ytvlPrD 9eGgUAOQ+Av+EqVeq8l8qS5G+lt231zuvwHOaXshqKCKfDgLNH9HRo6+XwANuwaG TstFRDEDxosDlfU8jNpxKa2maOFmCI+A57XoFeR1w+nnCabf7bhUxADxnsbY2rEU ByOHdqZ7F4tpbRRteuns2yZIS1T+tFpOmidbbIhBkh+cz6kmJwT+rg279OS2uRPp wFSc+b4u3fvnYK29mdsJoMTaNWpqsZVDMN6WJeMN+kymG0wXJVVUr4QcAdde1E5T XiEhiiFDzP6D9edSo+lk9sZBFYI2hY8w7JdUyU0AYb6f6jc8dQ/wyBrBe2H13lgp L2qYoHj9E73OciJgJQQXfapPzHTIuGh5PdPYeJpsKx3mjFsLdHrSggJZS4cp439d cM0gd+K+qQt+8xq7ZqERRPVopHb3341y7+2oFV6gyblY4gp0HAq8i2yA3TLeIfOm sGAqpsnYXE/jq8hI+b7UX1QhzIcO+LcJ43CC9aycILComYHR9QB6y4ImLTAELQ8J Nw5uq9GF8xw= =o2zU -----END PGP SIGNATURE----- --=-=-=--