From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id eKoOKc6jImaZVgAAqHPOHw:P1 (envelope-from ) for ; Fri, 19 Apr 2024 19:03:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id eKoOKc6jImaZVgAAqHPOHw (envelope-from ) for ; Fri, 19 Apr 2024 19:03:10 +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=1713546190; 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=mQlmt/FObMKjwuMb7DDU8QtqJX4hzXTvBryM2wBduMg=; b=Fl2pUQedH9ztlGdD9El7VQ2VrGcke7NDUIQcoPxoYDbUTVR6y70v2fmTvh8twNZeuQ1rlD LdIdK10yb5PGiA3NqIGLqVhlxhd3ZO2+HxXrVUnIvr8qFSVmmHsWaslOl233kzTjhSHsbB dEnPlikxBOyWxgEOLVEtph/SwsdjvmRUdE/+GVSo3fJfmyynMbNBFAV5fiDOXrAX+oVuyg XXtN8jR3ZBUHfnhBFd00KDaao/by99QXvy6UlCy5ijHzKoTnRaLHmoi9kmgqo5bYkrl5qf qaDs5Mw/7GgCXLt3SULc5Ip4UPe6qNXfQSmz2xBH2PMIb6L3YEqffjidox3JDA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713546190; a=rsa-sha256; cv=none; b=aBRuF4zivgM6ojzECSbZdRNEPMz7cvOnINSVUDDzonvPmxCbLA/lq+84m/5YM7a1CL/L+T Ot8SvIi7QgFC42/eq5EkcuIpMfCithuIiZf78sB6ssZFBYEbQNLE2mooxL6gqzyPKKXAfR s7wbjgOBSVptxClwd6TPJ6ES4FHNGuMUlbQ+mSr0bW+THBSLNnJR+SxoctJog0kip8ddum UcV2/fnukJk6imOyqH0C992gGK6m20WBib0W0NN4L5R9/WtICiPWNd/orPqqU/T51qYNgY oM1DdZJ8VsDRj+dt/UjNquz+/CFmyhwc1lTeZ9bBKAXdslfLtfjJc/4dDuZ98A== 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 773C03A020 for ; Fri, 19 Apr 2024 19:03:10 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxrcN-00023X-0M; Fri, 19 Apr 2024 13:01:43 -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 1rxrbV-0001Ab-0U for bug-guix@gnu.org; Fri, 19 Apr 2024 13:00:53 -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 1rxrbU-0004e2-F1 for bug-guix@gnu.org; Fri, 19 Apr 2024 13:00:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxrbi-0000tE-C7 for bug-guix@gnu.org; Fri, 19 Apr 2024 13:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#70456: Request for merging "core-updates" branch Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 19 Apr 2024 17:01: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 Cc: Maxim Cournoyer , steve@futurile.net Received: via spool by 70456-submit@debbugs.gnu.org id=B70456.17135460453298 (code B ref 70456); Fri, 19 Apr 2024 17:01:02 +0000 Received: (at 70456) by debbugs.gnu.org; 19 Apr 2024 17:00:45 +0000 Received: from localhost ([127.0.0.1]:59221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxrbQ-0000r6-2B for submit@debbugs.gnu.org; Fri, 19 Apr 2024 13:00:44 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:36547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxrbM-0000qE-At for 70456@debbugs.gnu.org; Fri, 19 Apr 2024 13:00:42 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id BCE8D27BBE9; Fri, 19 Apr 2024 18:00:24 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 8213a07f; Fri, 19 Apr 2024 17:00:24 +0000 (UTC) From: Christopher Baines In-Reply-To: <87il0d4dn0.fsf@cbaines.net> (Christopher Baines's message of "Fri, 19 Apr 2024 15:42:59 +0100") References: <87il0d4dn0.fsf@cbaines.net> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Fri, 19 Apr 2024 18:00:22 +0100 Message-ID: <877cgt47a1.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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -8.28 X-Spam-Score: -8.28 X-Migadu-Queue-Id: 773C03A020 X-Migadu-Scanner: mx13.migadu.com X-TUID: qOVR/gDnNMIS --=-=-= Content-Type: text/plain Christopher Baines writes: > 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. I've worked out at least when these two werid commits turned up on core-updates. 12b15585a7 is mentioned here: https://lists.gnu.org/archive/html/guix-commits/2023-09/msg00955.html and 28d1413095 is mentioned here: https://lists.gnu.org/archive/html/guix-commits/2024-03/msg00381.html With the changes last month in March, I was going to suggest deleting the branch and then re-creating from f205179ed2 and trying to re-apply the changes that should be on core-updates, while avoiding any "duplicate" commits. However, I'm not even sure where to being with the ~5000 commits pushed in September, at least one of them is a duplicate of a commit on master, but I'm not sure how many of the other ~5000 are. For comparison, I did a merge of master in to core-updates today, and this is what it shows up like on guix-commits: https://lists.gnu.org/archive/html/guix-commits/2024-04/msg01209.html There are only two new revisions, the ed update I pushed, and the merge commit, which is what a merge should look like as far as I'm aware. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYioyZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeddA/+MtC2Q79KS79HxTbG3yuL+VVDdEO4AT3Z 3RcIcBzw3k+fc4GAgMcxWqIujCrpQ+SP1BEY+Y+VkRD4DJW03F2zY2KxJO2jGfJd B7Wt1SNe99wWFSILVJXerckEw2MO9Ef/W9iZyFqt7ScwbLBAPEQm/n9onMR1o9e+ O6FAeMXNpwQ2t/jZLpD+Ip4gxlHsy08H+Ep7QkBLWbGb4r/mZxGBzBjTGGt5VY5e 96HDrb0iHdMPuQf8sE9tclIzlTY8enso8kqvsrDVq7fD3F0CmwEdBjNA3hP/Dt/g 90EsaeIXXH+ntzz9n7PboKs1Y8BAkiNtdCNhj8ZlcUDDDj5ZFU9qdDzljWJ7m3U8 9PZFy7QlNMSlMGMiVYEnjvhn7fCWG7ESLHSmacFCPKV43OVV/h645ZjchqK5Oet7 mFfVQqfRu/RY37m5pUkFKnCZhecDwLQP7XS1haQMIo7GLbDBXvNbUwlygp7VX2uj Chq9jLl6ci9Z6389aK1G4kUrtFoJZaPOWz8zhvKNkryWAq/faTuqY4DQHPB5LOcR dH62r0sdFSjmfEmD2JL3JVanspSi7xhWBr2hqGbkfTstA7ouTWnNOHfR2FieWefW iT2kU3grmcy1yUgNZQIbb85+7Ryfy+1TBEksHgb932sUgoaK1wD5lJ3pSPXwUHTs mOT8Ejci9V8= =40DP -----END PGP SIGNATURE----- --=-=-=--