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 WKhuCdCnZWYFBgAAA41jLg (envelope-from ) for ; Sun, 09 Jun 2024 15:02:08 +0200 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 IIzGANCnZWa9JAEA62LTzQ (envelope-from ) for ; Sun, 09 Jun 2024 15:02: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=1717938127; 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=uU5TeFvU+64djl7cNswFDvCSs5MYg7e4Z/K9fExoP2A=; b=pYfyUKDcgdCqsPcAZv7eicsEo4MskFAOwXmlLrhVQ1Njr8T1g4zdh/vl1+z+dgOl4+lhlZ KLjnu3QIm1CpT3oy6BCR028y1VxasANr6DuDS7Gfv9AaQUF8ewJDIG8GdepyIy6m45sUpw UWJPEHWMlPaOQ8ueM7a/SSud4VLRiD9dWL6pwDAR/DvsglNWzaoWau3rgEtXAAS4CE3ReU JgtMfeTORh3ZllGHXS/neHIzjAvyZAfvNY2w5U8LN9jiiWgKgKrlZfQ5qDbI+bnO603qwy YUycrRxMowluhz7sH/Xtw1vKJwxb9K7JYrKAHMsuaZLGx92faeKY/+DetiunrA== 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717938127; a=rsa-sha256; cv=none; b=qMyV6LZ1WmjlTGFos2CMGMomeb3FqSmmICIVo7Xb9xDlT1TwoSx6RQ3HlJCgsdeFAy4zvo DwhzUIlp+YJnP+A3FeaS4qMdEv683OfPi2SI68djJmrveZnOSJkH9Jh6hYvDZnJ8rCGjlo TlD1Wh317fi8m63jNO649xHg8G9m8U14weymBG4epzN1qIH1SDHNRyFHjeRgJaDxeGjMKH zf8Chyj0hYSFEiuZfP1t/sxe5+z1wf2QDqWs9egfbb8R99j/IIxRuG285AViWeipcrrPEL SMr/VR8Uk2MLequ/gWcybBnOcc7q97xnnnVp2IO+7lCjtKEvKS5oodqUwdSxwA== 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 ADD193E5E7 for ; Sun, 9 Jun 2024 15:02:07 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sGHqs-0006uB-4M; Sun, 09 Jun 2024 08:40:50 -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 1sGHqq-0006te-Fo for bug-guix@gnu.org; Sun, 09 Jun 2024 08:40:48 -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 1sGHqq-0006Ec-6r for bug-guix@gnu.org; Sun, 09 Jun 2024 08:40:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sGHr6-0008BT-H6 for bug-guix@gnu.org; Sun, 09 Jun 2024 08:41:04 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#70456: branch core-updates updated (c8c6883398 -> 0e06c9697a) Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 09 Jun 2024 12:41:04 +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 Received: via spool by 70456-submit@debbugs.gnu.org id=B70456.171793683431201 (code B ref 70456); Sun, 09 Jun 2024 12:41:04 +0000 Received: (at 70456) by debbugs.gnu.org; 9 Jun 2024 12:40:34 +0000 Received: from localhost ([127.0.0.1]:35325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sGHqb-000871-Br for submit@debbugs.gnu.org; Sun, 09 Jun 2024 08:40:34 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sGGoU-0005DO-NO for 70456@debbugs.gnu.org; Sun, 09 Jun 2024 07:34:19 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 3D50727BBE2 for <70456@debbugs.gnu.org>; Sun, 9 Jun 2024 12:34:01 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 29e34b93 for <70456@debbugs.gnu.org>; Sun, 9 Jun 2024 11:34:00 +0000 (UTC) From: Christopher Baines In-Reply-To: <87frtm1koq.fsf@cbaines.net> (Christopher Baines's message of "Sun, 09 Jun 2024 11:20:53 +0100") References: <171792086189.17847.16499633131068637226@vcs2.savannah.gnu.org> <87jziy1mal.fsf@cbaines.net> <87frtm1koq.fsf@cbaines.net> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Sun, 09 Jun 2024 12:34:00 +0100 Message-ID: <87bk4a1hav.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: -7.94 X-Spam-Score: -7.94 X-Migadu-Queue-Id: ADD193E5E7 X-Migadu-Scanner: mx13.migadu.com X-TUID: XJLVrDW4moeN --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Christopher Baines writes: > Efraim Flashner writes: > >> On Sun, Jun 09, 2024 at 10:46:10AM +0100, Christopher Baines wrote: >>> guix-commits@gnu.org writes: >>>=20 >>> > efraim pushed a change to branch core-updates >>> > in repository guix. >>> > >>> > from c8c6883398 gnu: dico: Add libxcrypt dependency. >>> > new 9804f8c149 gnu: coeurl: Update to 0.3.1. >>> > new 51c7b6d76f gnu: font-gnu-freefont: Build with newer fontforg= e. >>> > new 0e06c9697a gnu: Remove fontforge-20190801. >>> > >>> > The 3 revisions listed above as "new" are entirely new to this >>> > repository and will be described in separate emails. The revisions >>> > listed as "add" were already present in the repository and have only >>> > been added to this reference. >>>=20 >>> These changes confused me as I was looking at the trying to work out why >>> they needed to be pushed to core-updates. Eventually I figured out that >>> Git is right, these commits are entirely new, but they duplicate >>> existing commits already pushed to master (e.g. 0e06c9697a is a >>> duplicate of 3d5f4b2d7dda). >>>=20 >>> I know the new guidance says to "Avoid merging master in to the branch", >>> but one of the reasons for that is to avoid situations just like this >>> where merges are done incorrectly and commits are duplicated between >>> branches. >>>=20 >>> To fix this, I think we should rebase core-updates on master and drop >>> these commits. I've gone ahead and done this now. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZlkyhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xd3ZA//QUoZ/+12ZmuM6NyKrlnUYfIBCadz4gss Grz+rZPmjuj/huq7S45CADUD1opz425CIOqq0MSA88myPJGqyCl1uqakTyJ9ipS1 O8OT5lp73xqPWhqQnkNzD9huOOyT9LVvDZ7Lpz0ggI81DtfYoEC2eC0fGbJ7wIpy Bq+pk5C86YoiYW1F5jurJHClFLp8rARBb8+dKE/Xvirj74AwjLY0i9ISWVAb3kZR MRPPyZhgoMqS2K9E9Z7Ox7zMHuyxh29geEsJWEURmYEmgqndbcy0TYBUMEiGL0RZ R8vnYYJPOADnFme5CLxSVhp/1ebc8Yb9O6HZoTGHYeZFD5p+y308qPgzejB366fR QvsOqtrzM9VIpTbdnCwiRZFGJ/fzwPRFpor7QP6K+UtkGOLn/GgKZ2us6Q768AZV xQ4KvPkZj88AFCvC2sPbQmiFyLD4ggvL74eEUlkRPw0LKXz2NSxv0K85FsZg1SFp VphDmj8le1FZZUEVItyhTzHaeIYNGIictYzLUorw7SGvxl1qZexLd5m+GpDmxGFR 4Gz1OPSiAXJJfar77uyhHCBnG0Zm4ZF78/mVlvD1aiBdcpXuwBjD+rUCWuTEI+M+ 0ZwuUM7NslFeknc4jbHJiL//s0vyjSOXtfx3N4L3/HUAIBa4KkqGulwVRloEkp3m gxyZoN4g410= =jAYw -----END PGP SIGNATURE----- --=-=-=--