From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id iH+CEfh7ZWaMRAEAqHPOHw:P1 (envelope-from ) for ; Sun, 09 Jun 2024 11:55:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iH+CEfh7ZWaMRAEAqHPOHw (envelope-from ) for ; Sun, 09 Jun 2024 11:55:04 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=X4r+XgEF; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717926904; 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:dkim-signature; bh=Tne3HCa3q+lv8eOky2LXY3cUK2zso3O/PH1wYFaW7io=; b=gIYeltX6QJJLg9m8fII+iUV57vsKXvOsH12N1sK75ITvDc0xOH9XydPvknYFEUpki9Pgag 9k3zqKD9gJyYbNVYMXXzFoQM8qMqLyConSQmV2SJTTwo1ICQv/HGn/yVQUN44m8JvE4N0N DfOfVRQ4O4iU+hOpJj0w1XjvCIR7NwDzX+xcx5n0Exa8x57Jwm+nj0/FIbAvWmp4gSkIYv HWLofwow1JZBicDYjLI1fnJsLaQknItbDDvwzH9kzxRt7dYoc/cX9EScVvOKGW1mkel4dA tiS4krSJO0hIonmliS/yF22EdKSBerUE/RfE0+14Xb+irTsWe5v4cyDVyXOM6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=X4r+XgEF; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717926904; a=rsa-sha256; cv=none; b=EbFgLLR2rZyPQUCN5MNW0Qj7X9mqLvgQDrgDAytgQf/7X+Ofzzf/f9ZptH8ruxAcuiFek5 wO3fGy5X8emziCv1eDZeh3hCCgDmXCIYL5OYpmRQb0QljiynEg3rgSyt7PBzCa7EVE8FVg jymXOCCQZuoDvTNB6/wfFdmLj0a9L7ZXYZj91ahdwupUHx6/j6oy1GRvU/NCy0hliLPjJU XSCvAnPmpfJSZbFGCWi5sqRJsqbaDvUaPNyR2+409wZAsGLSV07gyxKrA/klTiZTP6YRGX KgaNTqHighjAjdC+kWza+cji51627FvH6B9YF93HSALbGnWgTpdd/nlrkPyekg== 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 0D3717DBF8 for ; Sun, 9 Jun 2024 11:55:04 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sGFFz-0002bf-KJ; Sun, 09 Jun 2024 05:54:35 -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 1sGFFx-0002bP-Dj for guix-devel@gnu.org; Sun, 09 Jun 2024 05:54:33 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sGFFu-0001K8-SY for guix-devel@gnu.org; Sun, 09 Jun 2024 05:54:33 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-421a1b834acso947925e9.3 for ; Sun, 09 Jun 2024 02:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717926869; x=1718531669; darn=gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=Tne3HCa3q+lv8eOky2LXY3cUK2zso3O/PH1wYFaW7io=; b=X4r+XgEFT/Ag/1S+AZK/76L+S5KhS4QrTyJ7tX3vM7Lhu6Cjpv02/hDbNPDeNi949H 1zXCSNPEPt1KLrSj0sUg68xZY2VRTNVGdH1TNsbQcvcpFGFxo5y88Lixjln71B2Tlli1 kbhWbvJVppU8IVSywPicO7LTRVB2civNOG4oRRP/f4NfnFZkicU9OLeFDlVDrmmMtfSX 35KdVvoVHzm8eMe8Phq23nvk9Yx/r7z+e2KFZ9wWDXtmMUYVlbYO369iyipfW8mNacYW Qr+PUXxIzJ7a1kmnpt1xf5IoY93nBukpZc24ZoHZBJcSnh1GBEF2n8GEpBFfx7v5touG KqAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717926869; x=1718531669; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Tne3HCa3q+lv8eOky2LXY3cUK2zso3O/PH1wYFaW7io=; b=ToX+jVayD6wU25Pf1tgRcdet/I9IWsYO09jPzUzWD/IXi2H1OJyh4uXLVHXMJdpoJV kBTMsdiYgarzxvL2Rskc9MRN/rhG2SzwIjsmR5TRtJJ2wH/+DzWZp5fl1itxP1MU8e+U BR6244j2I6EeW8kB5xCpdBME4B7ZLxOW6rIqdkM6I46ouW2/+2/D33yIEa+LF9YZiEBg KDMdSU83aNOqg7G4CjR8O8c1j56Qe5y7qE7RGQdPEUMh1V1qlkLOlThUtt3ARWqX+pRf V53UVBy8d9n0Ma1Yu9nYRjSwW1NYi4aVKXYQ7irS2KQ/G+iu4RC4k2Fh1hUlBkr++ciL ob5w== X-Gm-Message-State: AOJu0YxPkRJ3odaUZtsJA5uSIieIZ2u69EMtJMxFv140s5zVhI+k1WEI HI6J/U/vlETGZwy0/lKWOkJ7lkWiROZF0NBpgSIOqws/Qr6/5JeAG9q8lNwu X-Google-Smtp-Source: AGHT+IETEUaVO2m0SGiFrpihggNHfTWumMzwPn0SlizNi8jV9A59THgpJWWmnGcKoF6v/2yK5RXWGg== X-Received: by 2002:a05:600c:3c9b:b0:418:f760:abfb with SMTP id 5b1f17b1804b1-421649e9fa6mr45051095e9.5.1717926868911; Sun, 09 Jun 2024 02:54:28 -0700 (PDT) Received: from localhost ([141.226.8.103]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-421580fe37csm141662945e9.3.2024.06.09.02.54.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jun 2024 02:54:28 -0700 (PDT) Date: Sun, 9 Jun 2024 12:54:27 +0300 From: Efraim Flashner To: Christopher Baines Cc: guix-devel@gnu.org, 70456@debbugs.gnu.org Subject: Re: branch core-updates updated (c8c6883398 -> 0e06c9697a) Message-ID: Mail-Followup-To: Christopher Baines , guix-devel@gnu.org, 70456@debbugs.gnu.org References: <171792086189.17847.16499633131068637226@vcs2.savannah.gnu.org> <87jziy1mal.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pmhaRE1vMNgGvdt1" Content-Disposition: inline In-Reply-To: <87jziy1mal.fsf@cbaines.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=efraim.flashner@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -2.44 X-Migadu-Queue-Id: 0D3717DBF8 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -2.44 X-TUID: DGfPANLgpVuC --pmhaRE1vMNgGvdt1 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 fontforge. > > 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 wasn't aware I was "doing it wrong" with this, I saw that coeurl 0.3.0 failed on core-updates but a bump to 0.3.1 fixed the build, and it could go to master also. Similar story with working to remove fontforge-20190801 which no longer built on core-updates. I figured that applying the patch to both branches would make it easier to merge master into core-updates since there would be less drift between the two. What is the correct way to apply a patch to multiple branches? --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --pmhaRE1vMNgGvdt1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmZle88ACgkQQarn3Mo9 g1EPRhAAirfUI+i4zzMiooZD76weJ0GWsmBcVpvXIe4r3mMgtJ7+kKtqCBNRx9aC D8YqyQ7hYxL1x1oEa0eg153twa+dX/hEIBYKuNGbr/Y5rwmqb4Q5Ie3aJAwkM27C VVMzVGz1S5E1LXzV6ptX2KqLJPxISTD65OZ36m+QcGISpu1BhBpORuoD3v/PsDYF fQ55U5N1aE+PBzZJvuYLble6Ghz7BG6xYJs+1NJPMBz0xlwWPEloOa0LhUzCpYEm Ix3rSFm0EFK1bYWPpNRi83TvLHqbJPjWBY01njW5FnDEWFDla3KJnzzjHoagGwcV WZ3HD6l5bOsbsf6R0Ce9qXBb/5w9jzsBer3O820a/95eMZaNenrkENWH4XcCOOXo KjaVsm3at0bS1iZ3xzodhepE6XQ6kFpiwnpet08pusMEK7+kQfAJ7JNlN0zfm51a J2y0Qj5JmAUdYo9A6xhKVQBKkFQlBIijpKgQ32FjFDQfJM8LjcFz4O5a+kR9T6RM mg3AuJJsD/K8DZQqVe0ysXJqNUsY1uwKetEUuIQOBNw8EbeFXIuapWt4zfARRUAw iYdCmGnHLnrgs9J49ZvsTQYIbCkgPUULlx9BfgXgqz6DrkW2vR20TGe8UoqI5qge 4rkuJhSoc+Oy0CtCHblbtkO8b8DmNT0wjPCQ9zONAK6nU2BBTx4= =Ysf2 -----END PGP SIGNATURE----- --pmhaRE1vMNgGvdt1--