X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Request for merging core-updates branch
Resent-From: Steve George <steve@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Thu, 18 Apr 2024 14:58:03 +0000
Resent-Message-ID: <handler.70456.B.171345224416305 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: 70456 <at> debbugs.gnu.org
X-Debbugs-Original-To: bug-guix@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.171345224416305
(code B ref -1); Thu, 18 Apr 2024 14:58:03 +0000
Received: (at submit) by debbugs.gnu.org; 18 Apr 2024 14:57:24 +0000
Received: from localhost ([127.0.0.1]:52896 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxTCU-0004Ev-U0
for submit <at> debbugs.gnu.org; Thu, 18 Apr 2024 10:57:24 -0400
Received: from lists.gnu.org ([2001:470:142::17]:50892)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <steve@HIDDEN>) id 1rxTCS-0004EV-Bv
for submit <at> debbugs.gnu.org; Thu, 18 Apr 2024 10:57:21 -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 <steve@HIDDEN>)
id 1rxTC8-0003vM-Tf
for bug-guix@HIDDEN; Thu, 18 Apr 2024 10:57:00 -0400
Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <steve@HIDDEN>)
id 1rxTC6-0007pk-H0
for bug-guix@HIDDEN; Thu, 18 Apr 2024 10:57:00 -0400
Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com)
by mailtransmit05.runbox.com with esmtps (TLS1.2) tls
TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93)
(envelope-from <steve@HIDDEN>) id 1rxTBz-002oi3-95
for bug-guix@HIDDEN; Thu, 18 Apr 2024 16:56:51 +0200
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject:
To:From:Date; bh=dGjeWdHb6EM0Gr07tbDucXvavVuVcLnBvJKJm6IonE4=; b=ff0Mi0LXR9lR
SozfArEvsVt3Ip5rmtLJYHEn222jZIKHa2gD7D8ONknM7tT8q/SwtVSKNouUtYllDghvLYnOQyokD
CGRzzfe1gY//xAjX9JL32w6qDfEUrs3GuoQyEFLn+GhE36aPRJT4H/Nkv7xYKoxmxJPAQ9EHQUd4E
FJ4jC4Xz0qFMaRLvTF+eb9T9/Y+kB6SPh2xvgRFjo9YnZhVFhrnkEfMCjy4/vk5aPpaSbt+FzvchF
kjJfP5aDwWqd0sn0c/9di3of/R3abOhmRYDi5UQf2PLLWRbbu1i/6WRYC2HFi5leKETL6UN9rcKdo
BZp/p+mDv1tn6rgw7sMfng==;
Received: from [10.9.9.72] (helo=submission01.runbox)
by mailtransmit03.runbox with esmtp (Exim 4.86_2)
(envelope-from <steve@HIDDEN>) id 1rxTBy-0000cz-V1
for bug-guix@HIDDEN; Thu, 18 Apr 2024 16:56:51 +0200
Received: by submission01.runbox with esmtpsa [Authenticated ID (641962)]
(TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93)
id 1rxTBq-003E1S-ED
for bug-guix@HIDDEN; Thu, 18 Apr 2024 16:56:42 +0200
Date: Thu, 18 Apr 2024 15:56:41 +0100
From: Steve George <steve@HIDDEN>
Message-ID: <ZiE0qcjXe5H_3XLT@dragon2>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Received-SPF: permerror client-ip=2a0c:5a00:149::26;
envelope-from=steve@HIDDEN; helo=mailtransmit05.runbox.com
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001,
T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Let's see where we are with the branch currently.
Thanks,
Steve / Futurile
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Steve George <steve@HIDDEN> Subject: bug#70456: Acknowledgement (Request for merging core-updates branch) Message-ID: <handler.70456.B.171345224416305.ack <at> debbugs.gnu.org> References: <ZiE0qcjXe5H_3XLT@dragon2> X-Gnu-PR-Message: ack 70456 X-Gnu-PR-Package: guix Reply-To: 70456 <at> debbugs.gnu.org Date: Thu, 18 Apr 2024 14:58:03 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): bug-guix@HIDDEN If you wish to submit further information on this problem, please send it to 70456 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 70456: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70456 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
Received: (at control) by debbugs.gnu.org; 18 Apr 2024 18:51:42 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Apr 18 14:51:42 2024 Received: from localhost ([127.0.0.1]:54030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rxWrF-00010H-Ao for submit <at> debbugs.gnu.org; Thu, 18 Apr 2024 14:51:42 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:56003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1rxWrD-0000zi-6T for control <at> debbugs.gnu.org; Thu, 18 Apr 2024 14:51:39 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id E22C427BBE9 for <control <at> debbugs.gnu.org>; Thu, 18 Apr 2024 19:51:22 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 52ee8c93 for <control <at> debbugs.gnu.org>; Thu, 18 Apr 2024 18:51:22 +0000 (UTC) From: Christopher Baines <mail@HIDDEN> To: control <at> debbugs.gnu.org User-Agent: mu4e 1.12.2; emacs 29.3 Date: Thu, 18 Apr 2024 19:51:22 +0100 Message-ID: <87ttjy4i8l.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: retitle 70456 Request for merging "core-updates" branch thanks Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: 1.0 (+) retitle 70456 Request for merging "core-updates" branch thanks
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Request for merging "core-updates" branch
References: <ZiE0qcjXe5H_3XLT@dragon2>
In-Reply-To: <ZiE0qcjXe5H_3XLT@dragon2>
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Fri, 19 Apr 2024 14:44:02 +0000
Resent-Message-ID: <handler.70456.B70456.17135378015293 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: 70456 <at> debbugs.gnu.org, steve@HIDDEN
Received: via spool by 70456-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxpST-0001NJ-2X
for submit <at> 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 <mail@HIDDEN>) id 1rxpSR-0001Mp-Cl
for 70456 <at> 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 <mail@HIDDEN>
User-Agent: mu4e 1.12.2; emacs 29.3
Date: Fri, 19 Apr 2024 15:42:59 +0100
Message-ID: <87il0d4dn0.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
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-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Request for merging "core-updates" branch
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Fri, 19 Apr 2024 17:01:02 +0000
Resent-Message-ID: <handler.70456.B70456.17135460453298 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: 70456 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, steve@HIDDEN
Received: via spool by 70456-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rxrbQ-0000r6-2B
for submit <at> 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 <mail@HIDDEN>) id 1rxrbM-0000qE-At
for 70456 <at> 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 <mail@HIDDEN>
In-Reply-To: <87il0d4dn0.fsf@HIDDEN> (Christopher Baines's message of
"Fri, 19 Apr 2024 15:42:59 +0100")
References: <ZiE0qcjXe5H_3XLT@dragon2> <87il0d4dn0.fsf@HIDDEN>
User-Agent: mu4e 1.12.2; emacs 29.3
Date: Fri, 19 Apr 2024 18:00:22 +0100
Message-ID: <877cgt47a1.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Christopher Baines <mail@HIDDEN> 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-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Status of =?UTF-8?Q?=E2=80=98core-updates=E2=80=99?=
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sat, 20 Apr 2024 11:15:03 +0000
Resent-Message-ID: <handler.70456.B70456.171361169626471 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Cc: Guix Devel <guix-devel@HIDDEN>, Josselin Poiret <dev@HIDDEN>, 70456 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.171361169626471
(code B ref 70456); Sat, 20 Apr 2024 11:15:03 +0000
Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 11:14:56 +0000
Received: from localhost ([127.0.0.1]:35799 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ry8gK-0006st-Cg
for submit <at> debbugs.gnu.org; Sat, 20 Apr 2024 07:14:56 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43354)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>) id 1ry8gF-0006rz-TB
for 70456 <at> debbugs.gnu.org; Sat, 20 Apr 2024 07:14:53 -0400
Received: from localhost (unknown [212.132.255.10])
by mira.cbaines.net (Postfix) with ESMTPSA id 01D2527BBE2;
Sat, 20 Apr 2024 12:14:35 +0100 (BST)
Received: from felis (localhost.lan [127.0.0.1])
by localhost (OpenSMTPD) with ESMTP id 77dc5899;
Sat, 20 Apr 2024 11:14:35 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
In-Reply-To: <87edbzri2p.fsf@HIDDEN> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sun, 24 Mar 2024 12:21:34 +0100")
References: <87edbzri2p.fsf@HIDDEN>
User-Agent: mu4e 1.12.2; emacs 29.3
Date: Sat, 20 Apr 2024 12:14:33 +0100
Message-ID: <87mspo2sme.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
> What=E2=80=99s the status of =E2=80=98core-updates=E2=80=99? What are th=
e areas where help is
> needed?
>
> I know a lot has happened since the last update=C2=B9, which is roughly w=
hen
> I dropped the ball due to other commitments, but I=E2=80=99m not sure whe=
re we
> are now.
I haven't really been following core-updates, but I have had a look
since there's a request to merge it now [1].
I'm really concerned by the commits on the branch though, assuming I'm
using Git right, there are 6351 commits on the branch:
git log --pretty=3Doneline core-updates ^master | wc -l
Somehow, I think there's been a couple of pushes of commits to
core-updates that have partially duplicated lots of commits from master,
I put some more details in:
https://issues.guix.gnu.org/70456#3
I think keeping the Git commit history clean and representative is
really important, so to me at least this means core-updates can't be
merged to master in it's current form, even if the changes overall from
these 6351 commits are reasonable.
I'm really not sure how to move forward though, I had a go at trying to
rebuild the branch without introducing the thousands of duplicate
commits and that produced a branch with 765 commits over master, which
still seems a lot, but a big improvement over 6351:
https://git.cbaines.net/guix/log/?h=3Dchris-core-updates-no-duplicates-at=
tempt
That was really hard going though, as there's plenty of merge conflicts
along the way, and I'm pretty sure I solved some of them
incorrectly. The resulting branch also differs from core-updates.
Maybe someone with more time, care and attention could do a better job,
but it might be more worthwhile just starting fresh and rather than
trying to produce a like for like branch just without the thousands of
duplicate commits, effectively manually rebase the branch (without the
duplicate commits) on master and try to get the commits in to a usable
state.
Any ideas?
Thanks,
Chris
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYjo5lfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XekIQ/+KuLYQirShTHCf9rGDm8wZHHZWlF7zSuK
nMpV9021Xddb9uHY6LD8Zy3N8D/91GtfgiWuYujhxhGeylfr7nVk8J05K4nXlWeX
NfMTcAENmAOkxuSc2W9lERY851wJ4wrQ0WUN72UcbPB/Mxwrq4ZX7PxvYAqbP3fI
khWwcImneoGgVxOr0w7pxE+9bONQ22pbPpgeh+7Cbqi7aPiKxMTg/A8ByNdea8RM
WJ3hPdaeTlJq9+d9gR4mn9H7aerPJVqsWxu4LC6L/7Bdho+KCId1hZJ71JV6jDAc
Qty4xSwr7aQ65mhqmiGN8u4MFAm6Q1vWfkQKA3r/9YvdzZPj65g1+s4wMCLdh0wN
w9/XmR/MiLai+4xWqKXvTjCxjWLN5DpaOcuTrM9bpfu7dCVtVPIQ8b8g0n2uHSxa
8np0reYM+v4K9eQUwSDvtt5kpbe8ntF9Ds9RNahQ1lelt+14r1hz0DjQDO31tcdf
tCLYnuuO7mm2AOy9Pl0PjkfBxtktRfQs0Q2xU4Ff/UBIzw2r8FkKQaaBrrZKklrr
Hs8ru/lDjZe7E0hzquMduPajRDyJIGMTLjjJ7jhWOiTzrw7Cwy7NsJLDyAHB7H4T
L3u9EhOjVnQYHF445vl0Rvnu+AkAIeXqvlzp/m/4Xc5fcgKmDkB48l6jWrCKeqDv
HOk2q5j/CAs=
=imOn
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Request for merging "core-updates" branch
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sat, 20 Apr 2024 16:17:02 +0000
Resent-Message-ID: <handler.70456.B70456.17136297911783 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: Christopher Baines <mail@HIDDEN>
Cc: 70456 <at> debbugs.gnu.org, steve@HIDDEN
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.17136297911783
(code B ref 70456); Sat, 20 Apr 2024 16:17:02 +0000
Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 16:16:31 +0000
Received: from localhost ([127.0.0.1]:37028 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ryDO9-0000SN-0o
for submit <at> debbugs.gnu.org; Sat, 20 Apr 2024 12:16:30 -0400
Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:60873)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1ryDO6-0000RS-OS
for 70456 <at> debbugs.gnu.org; Sat, 20 Apr 2024 12:16:27 -0400
Received: by mail-qk1-x735.google.com with SMTP id
af79cd13be357-78f05e56cb3so186260685a.1
for <70456 <at> debbugs.gnu.org>; Sat, 20 Apr 2024 09:16:11 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1713629766; x=1714234566; darn=debbugs.gnu.org;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=R5V6wB/hXnxMPdSYQ4MOwn9Gb98YqhF8LpBtsIMpHl0=;
b=EWF7wpVcWx0zl2UjeaN7mYcFil7h1VDRSjlwfmO8alsex6gp7+/2ObVRCT8SZc2Ecr
Ck2DkglcjPjyAfMMS/xD6WQRZ5jmSgnBiyD1pFiNZ6+E7uyiQOs1zuzCKU+7am7R4uw3
tmsZLEOSFrtYjbLltYXiU4DpvMMbwwJ6uimdClRpj5EE39wXxh1n4WQ23xJ2na/2lu5W
pW7XdX4mWhlTajWnqT5zbGMHv/2wlhuB3socp6t2SunYlFLQzlSbfshnDEqSP4BOuiO7
0U8wrfhkTo3gDBDAcQTFicvN/dgaCLZORrTObu8nSlL9opDCSVd9TE+pcOmifhqTME4+
u9tQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1713629766; x=1714234566;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=R5V6wB/hXnxMPdSYQ4MOwn9Gb98YqhF8LpBtsIMpHl0=;
b=DO/f7YXYiSb1fLhMQ+3PRops9hsRU52J12iZiezCi0eZDYOEspwS82fkpui5DBzJqx
pF5pAhflNSItv14sgBDFuwRtFVvShUw37HYRnkXx9XMGOT3oUaFGr5LQYhbukMUhmLm6
HCIianZ1kNAPuA6nZP1MRfGn7sEvVhYsIqV03Kc/KM8tSXnaaYyRhQPdjK5ZTBfFIsGY
c0QylOILxv2qxiuuE6iaoEl3J060DfIBD0WO5jG5BcGyKyFy5HcG0bXWD4tNTEwWVi21
fIknIRBbXEJ961AGVaKDq410zN0pcEDaQFHBDD1BReMTjG7odBJVLf26TKMMdZkTUi0h
eqJw==
X-Gm-Message-State: AOJu0Yxt/6U2H2Pp8j3uHbUX8PQlBtacGZlqwmXHWADBRcYDeM0MMjVy
c6VH/HQNzRklJW6Wkx1aX9lBx+kEzxd6dgkzgxwPrq/s3ioc+vVF
X-Google-Smtp-Source: AGHT+IFr+0PpDG5kccTxjeW9NtnVKjhAd61Wf9cAIkuWfdXMX/5UxB9F1OEzOLoUCIxzxYJ6+clcvA==
X-Received: by 2002:a05:620a:1d93:b0:78d:65bc:d83e with SMTP id
pj19-20020a05620a1d9300b0078d65bcd83emr5822972qkn.18.1713629766146;
Sat, 20 Apr 2024 09:16:06 -0700 (PDT)
Received: from hurd (dsl-10-134-76.b2b2c.ca. [72.10.134.76])
by smtp.gmail.com with ESMTPSA id
k6-20020a05620a07e600b007905e4a1ae1sm1132366qkk.96.2024.04.20.09.16.04
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 20 Apr 2024 09:16:05 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <877cgt47a1.fsf@HIDDEN> (Christopher Baines's message of
"Fri, 19 Apr 2024 18:00:22 +0100")
References: <ZiE0qcjXe5H_3XLT@dragon2> <87il0d4dn0.fsf@HIDDEN>
<877cgt47a1.fsf@HIDDEN>
Date: Sat, 20 Apr 2024 12:16:03 -0400
Message-ID: <87bk64j9h8.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Christopher Baines <mail@HIDDEN> writes:
> Christopher Baines <mail@HIDDEN> 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.
I think probably what happened is that in the middle of a merge of
master -> core-updates (which entails sometimes painful conflicts
resolution), a new commit pushed to core-updates, and to be able to push
the resulting local branch (including the thousands of commits from the
merge commit) got rebased on the remote core-updates.
Perhaps another merge commit appeared on the remote around the same
time, which would explain the duplicates.
While I agree it's messy to have 5000 of duplicated commits, I'm not
sure attempting to rewrite the branch, which has seen a lot of original
commits, is a good idea (it'd be easy to have some good commits fall
into cracks, leading to lost of work).
I'd rather we take this experience as a strong reminding that rebasing
merge commits should be avoided at all costs (git already issues a
warning, IIRC). As you suggested, the next time a situation like this
happens (locally prepared merge commit with new commits made to the
remote branch), merging the remote into the local branch is probably a
nicer solution.
--
Thanks,
Maxim
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Request for merging "core-updates" branch
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sat, 20 Apr 2024 18:09:03 +0000
Resent-Message-ID: <handler.70456.B70456.171363653820030 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Cc: 70456 <at> debbugs.gnu.org, steve@HIDDEN
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.171363653820030
(code B ref 70456); Sat, 20 Apr 2024 18:09:03 +0000
Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 18:08:58 +0000
Received: from localhost ([127.0.0.1]:37469 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ryF8y-0005Cq-OQ
for submit <at> debbugs.gnu.org; Sat, 20 Apr 2024 14:08:58 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43356)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>) id 1ryF8v-0005C8-HW
for 70456 <at> debbugs.gnu.org; Sat, 20 Apr 2024 14:08:54 -0400
Received: from localhost (unknown [212.132.255.10])
by mira.cbaines.net (Postfix) with ESMTPSA id 4DCC827BBE2;
Sat, 20 Apr 2024 19:08:37 +0100 (BST)
Received: from felis (localhost.lan [127.0.0.1])
by localhost (OpenSMTPD) with ESMTP id 28502300;
Sat, 20 Apr 2024 18:08:36 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
In-Reply-To: <87bk64j9h8.fsf@HIDDEN> (Maxim Cournoyer's message of "Sat, 20
Apr 2024 12:16:03 -0400")
References: <ZiE0qcjXe5H_3XLT@dragon2> <87il0d4dn0.fsf@HIDDEN>
<877cgt47a1.fsf@HIDDEN> <87bk64j9h8.fsf@HIDDEN>
User-Agent: mu4e 1.12.2; emacs 29.3
Date: Sat, 20 Apr 2024 19:08:34 +0100
Message-ID: <87h6fv3o0t.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Maxim Cournoyer <maxim.cournoyer@HIDDEN> writes:
> Hi,
>
> Christopher Baines <mail@HIDDEN> writes:
>
>> Christopher Baines <mail@HIDDEN> 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.
>
> I think probably what happened is that in the middle of a merge of
> master -> core-updates (which entails sometimes painful conflicts
> resolution), a new commit pushed to core-updates, and to be able to push
> the resulting local branch (including the thousands of commits from the
> merge commit) got rebased on the remote core-updates.
>
> Perhaps another merge commit appeared on the remote around the same
> time, which would explain the duplicates.
>
> While I agree it's messy to have 5000 of duplicated commits, I'm not
> sure attempting to rewrite the branch, which has seen a lot of original
> commits, is a good idea (it'd be easy to have some good commits fall
> into cracks, leading to lost of work).
I think it's important to weigh up the cost and risks associated with
either merging these commits, or somehow avoiding doing so. I think the
potential impact is more than just a bit of messy Git history.
Assuming we merge core-updates without doing anything about these
duplicate commits, and taking the cwltool package as a semi-random
example, if you do:
git log -p gnu/packages/bioinformatics.scm
You're going to see two commits for the update to 3.1.20240112164112,
that's maybe confusing, but not a big issue I guess since they look the
same, just different hashes.
But say you're looking at the Git history because you want that specific
version of cwltool and you're going to use guix time-machine or an
inferior looking at that revision. Well, it's a lucky dip. If you pick
the original master commit, you're in luck, you'll probably get
substitutes for cwltool. But if you pick the other seemingly identical
commit, you're effectively checking out core-updates as it was last
month and the chance of substitutes is much less likely. I also can't
really think how you'd work out which commit is best to use once
core-updates is merged? The easiest way would probably be to check the
signature, but that will only work most of the time.
This isn't a new issue, it's already problematic for substitute
availability to use intermediate commits (commits that weren't directly
pointed to by master). But there are over 1000 packages who's versions
are being changed on core-updates currently, or at least it looks like
this because of the duplicate commits, and if I'm correct about how
people are using the git history to find commits for specific versions
of packages, then having these duplicates in the Git history for master
forever more is going to catch people out for as long as those versions
remain relevant.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYkBKJfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XeyBBAAtzoraZGiN1S8oA+s7mUFZBlnAmOG6P73
D+jiHOwibqAzMQM8+gFe/1K+Aqfk/Dv7tRRRiDS7AKaqNwBwh9ZcYrRZcy6z2Pdk
7oxB4X7nVQleFr+ljwvuNp0YsvJh31OSUTPoVgo1HfOwnBnvugcwImx9gzjPdJ+R
JFT5RHJJyHrtcFOYG45yk6K0NxqDu5ZTukwH8cYQTHFdctYMqBTq249BaME6tozT
FIWQH6BGuNEVHNsW+8ReOLRyf394YsqBxy4VDGc3TuiGlNTAkWiIX6QdNaPBd0kM
gN5gwNnI6ngukAXwgo/Mhf9iCqCyPnMNblpbSRic+IwsLXbQP6djU5enAo2s0xHs
y3pyND8TkUB1XakgHtPWhNFFGoHzuklzV8RPIO1RAL0u6lvqyG2qZT11rsKOElD4
Jx9etuGnz+xM6IQivcwpxHwRJoKUf+z91sYbIP/8OOtF0MuW2jBL48ysRTrHxALn
wBE+74wuolENicS6LfvFS7qvK96340Y9pVIUKqof1IGJPbIvRQNikx9uTZ+tDf6I
QXn+S3HYQhxcgviyEbtDYkWSpbfMQ594trlhPmczGgaYUVlSniuBWxPAf41twF4G
bX/JpUxjMR/qy0zY8fPoPg3eu+v4piMBUoIfsWDW1ryIDzGLVIqln6I42A3d5no8
bss9DuR15pM=
=AnWa
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Status of =?UTF-8?Q?=E2=80=98core-updates=E2=80=99?=
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sat, 20 Apr 2024 21:16:01 +0000
Resent-Message-ID: <handler.70456.B70456.171364773227695 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: Christopher Baines <mail@HIDDEN>
Cc: Guix Devel <guix-devel@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Josselin Poiret <dev@HIDDEN>, 70456 <at> debbugs.gnu.org
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.171364773227695
(code B ref 70456); Sat, 20 Apr 2024 21:16:01 +0000
Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 21:15:32 +0000
Received: from localhost ([127.0.0.1]:38219 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ryI3Y-0007Cc-8G
for submit <at> debbugs.gnu.org; Sat, 20 Apr 2024 17:15:32 -0400
Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:54276)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1ryI3W-0007CG-EU
for 70456 <at> debbugs.gnu.org; Sat, 20 Apr 2024 17:15:31 -0400
Received: by mail-qt1-x832.google.com with SMTP id
d75a77b69052e-43692353718so21608261cf.0
for <70456 <at> debbugs.gnu.org>; Sat, 20 Apr 2024 14:15:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1713647709; x=1714252509; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=OCz4GHhnhaDD0rES9aLAl/kszxSagKBWfUQ3wxg3Txw=;
b=SPOKpodco60mO5o6l3brM405F5fR0OV657cljIrb2bT7Jz6Q1D26IktGMFOXt5fW6E
rMQmFON0oEi2gYAy4qcbrR8Dla6Uq/od0GRZq3t0iH5oi7wVfPwTkU4q6TM64CKgj+tE
IwUzbro+z3SNY2fvYlZ3W0dul5AjNkPPTm9JRDoJU5miii7G0vQYEegIUEGi4dpQDzfq
Iwdp1eE9790OtS7gZ3gjAdLhgZ2UP7FytOX3UI0PJfNZObB/DW3TlA41iY2qOG74JA+0
RPlzuwijviEcJVRsGw97TqbN7Y3BglBZcV3xuDLO6UKyJrDZC1Tj1p4QBEYbR/BpYrYy
oJ8w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1713647709; x=1714252509;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:x-gm-message-state:from
:to:cc:subject:date:message-id:reply-to;
bh=OCz4GHhnhaDD0rES9aLAl/kszxSagKBWfUQ3wxg3Txw=;
b=ucQeB366iABcJbbQGx9ZjC+ujHt9oYQqlVURaDP/ExhnrKphRXc81eYprcWV2xWvTO
rZBBj1HWf8s8wGVQxVvMQxOvyDypgK53ONv4knop6fTSowVyqrYjeoJAMSQ6Oj+MD1kq
pApmgI8YvK8OMsH5Q5nn4GuFIzBxworw95Y0Z5i6glGlzHS7nw03YTlfK+Gn3zYQOlTO
PqE+SkJ1jXAKPED3ERKzSHURoJb2Y6gRG2LUbyrxZIiaE+vx8QdXFjtC8mPiOJxRbo3V
WkpSwmj+wh2PXL766TdKfZn/F483j431zymDJI1644DiPTNsSzevhDfRbmI5og4Q/r5M
xUZw==
X-Forwarded-Encrypted: i=1;
AJvYcCVWMsk91jA6+TAhPoVYXSo5iR8u1LTz5J+Jy7nWW9a+gCyG8sChaojTEMmNrG0If9w9UkH7ZkjevgNvJ+J1Oppw2Lybtyg=
X-Gm-Message-State: AOJu0Ywh254lsJekotwvgkfOPHRx3LV6+dvgqS7riKJAJYFU84dQ10xz
mEwD1o8WKgtyXdEr41k6Oan1QVV621MH5xZdqj77ca49bA8mirSIU+Zwvg==
X-Google-Smtp-Source: AGHT+IF4T4LX1NMUsUMAnEBbylZI++lJreD0hmvr1pAMj5/4rlr1VVqgRztEna2Tp248Hz+cWed5XQ==
X-Received: by 2002:a05:622a:651:b0:437:b6a1:de30 with SMTP id
a17-20020a05622a065100b00437b6a1de30mr6077539qtb.12.1713647709358;
Sat, 20 Apr 2024 14:15:09 -0700 (PDT)
Received: from hurd (dsl-10-134-76.b2b2c.ca. [72.10.134.76])
by smtp.gmail.com with ESMTPSA id
g19-20020ac84813000000b004364d940d3dsm2799648qtq.96.2024.04.20.14.15.08
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 20 Apr 2024 14:15:08 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <87mspo2sme.fsf@HIDDEN> (Christopher Baines's message of
"Sat, 20 Apr 2024 12:14:33 +0100")
References: <87edbzri2p.fsf@HIDDEN> <87mspo2sme.fsf@HIDDEN>
Date: Sat, 20 Apr 2024 17:15:07 -0400
Message-ID: <87mspnivms.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Christopher,
Christopher Baines <mail@HIDDEN> writes:
> Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
>
>> What=E2=80=99s the status of =E2=80=98core-updates=E2=80=99? What are t=
he areas where help is
>> needed?
>>
>> I know a lot has happened since the last update=C2=B9, which is roughly =
when
>> I dropped the ball due to other commitments, but I=E2=80=99m not sure wh=
ere we
>> are now.
>
> I haven't really been following core-updates, but I have had a look
> since there's a request to merge it now [1].
>
> I'm really concerned by the commits on the branch though, assuming I'm
> using Git right, there are 6351 commits on the branch:
>
> git log --pretty=3Doneline core-updates ^master | wc -l
>
> Somehow, I think there's been a couple of pushes of commits to
> core-updates that have partially duplicated lots of commits from master,
> I put some more details in:
>
> https://issues.guix.gnu.org/70456#3
>
> I think keeping the Git commit history clean and representative is
> really important, so to me at least this means core-updates can't be
> merged to master in it's current form, even if the changes overall from
> these 6351 commits are reasonable.
>
> I'm really not sure how to move forward though, I had a go at trying to
> rebuild the branch without introducing the thousands of duplicate
> commits and that produced a branch with 765 commits over master, which
> still seems a lot, but a big improvement over 6351:
>
> https://git.cbaines.net/guix/log/?h=3Dchris-core-updates-no-duplicates-=
attempt
>
> That was really hard going though, as there's plenty of merge conflicts
> along the way, and I'm pretty sure I solved some of them
> incorrectly. The resulting branch also differs from core-updates.
I also think Git commit history is important, but in this case I weigh
the value of removing ~5000 duplicated rust commits against the risks of
resolving merge conflicts wrong or forgetting commits upon attempting to
recreate the branch from scratch lower than the benefit.
> Maybe someone with more time, care and attention could do a better job,
> but it might be more worthwhile just starting fresh and rather than
> trying to produce a like for like branch just without the thousands of
> duplicate commits, effectively manually rebase the branch (without the
> duplicate commits) on master and try to get the commits in to a usable
> state.
Given the little attention core-updates is currently receiving, I doubt
someone is willing to put the effort to recreate the branch from scratch
to clean its git history; at least speaking for myself I'd rather spend
the little hack time I have to work on it toward getting it finalized.
I believe how these duplicates came to exist was probably two separate
master -> core-updates merge commits, with one of them ending up being
rebased on top of the other, probably so that it could be pushed.
Perhaps we could capture in our contribution guidelines that rebasing a
merge commit should never be done to keep the history clean, and that in
a situation where:
1. a merge has been prepared locally (with conflicts resolved and all)
2. a new commit has appeared on the remote branch
the solution should be to merge the remote branch into the local one
instead of rebasing the local one on the remote one (as is usually
done). Disclaimer: I haven't actually tried this suggested approach,
which should be done before documenting it, if there's a consensus to do
so.
In other words, I suggest we document what *not* to do to avoid
repeating the same mistake in the future, and move on.
--=20
Thanks,
Maxim
Received: (at control) by debbugs.gnu.org; 22 Apr 2024 09:40:10 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 22 05:40:10 2024 Received: from localhost ([127.0.0.1]:45668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ryq9h-000127-2K for submit <at> debbugs.gnu.org; Mon, 22 Apr 2024 05:40:09 -0400 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:34228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1ryq9c-0000zv-Eb for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 05:40:06 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1ryq9D-00DPrV-Tl for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:39:39 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date; bh=fB8jOKVULh8be+wgW56Rh2OU5WkmtTt/RRelFsphuuw=; b=k5+PUzatsFnm OOvB7UKh60TKziAVRiJ2Cnk+fkhBkyaebwCTqQCM/fCmTgkyEBHG0Dig7uYEHwobkbr6Ttigvsx37 wdq2mg+HX5cujLzyWgZgLNBn/csBig3LmSzkdCoCzfPT40GSEN6wi1Z0P70sK0Ap9EE71gezDO24k khJh3wk48L++zn9orv8rNyxrCBe6k68hY7DoHalTblqKz7I3A3cGr0Oagy5vCO57Z1QxuqqwOxziq Em0uI7gKNPlfQVzzMrq5ATQ8RjdDBTUKOEHd0ETrq0RuaHeijAQQh9N49S5pM4C4bWzBWpOAjGmc2 +4THdGg+P5/b7tjbShVuow==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1ryq9D-0006O7-GX for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:39:39 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1ryq8u-001139-Ow for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:39:20 +0200 Date: Mon, 22 Apr 2024 10:39:19 +0100 From: Steve George <steve@HIDDEN> To: control <at> debbugs.gnu.org Subject: block 70456 with 67973 Message-ID: <1713778748-3175-bts-steve@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: devscripts bts/2.22.1ubuntu1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) block 70456 with 67973 thanks
Received: (at control) by debbugs.gnu.org; 22 Apr 2024 09:42:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 22 05:42:36 2024 Received: from localhost ([127.0.0.1]:45677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ryqC3-0001J1-Pa for submit <at> debbugs.gnu.org; Mon, 22 Apr 2024 05:42:36 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:56836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1ryqC0-0001Hs-T3 for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 05:42:34 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1ryqBe-00Ck2Z-7c for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:42:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date; bh=E/jnR92kl/xjDEwt6QDdOjgE4rCHw/Xq6RwWlT2w4m8=; b=VnojTljWkxTf DuS6Bg1L/FGE4df8rcYOLwARDSIdBnFVEHycno15LVwBUg9cH5jvvaRsFTUQ7XvsQCDG3m/3wO8qa 4vH9l0cC3tl0Y1J7ie6G9Lw4G2eKhXWPD4zyDmhxmeGv04S10KCP4kJGlD2AX7NN0RW590fJpOjb8 BUaHzOxjHoqsjIN3E+UwaGf2L6NC6MQCoMbwDGlqbtLgkKreMo5Uo16TPmJBNS5rZarXdsziCW/ti bsvDpnShe5c8Slltx1ToGWYZJYP+rRNgaLswCXPKLY/THlTLINfwl8mC1vnK75XymDuvhmbQrGcfU cIjF7L0vK1W9uR1PZc63Zw==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1ryqBd-0006cM-SN for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:42:09 +0200 Received: by submission01.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1ryqBP-000JmV-3C for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:41:55 +0200 Date: Mon, 22 Apr 2024 10:41:54 +0100 From: Steve George <steve@HIDDEN> To: control <at> debbugs.gnu.org Subject: block 70456 with 45885 Message-ID: <1713778908-2675-bts-steve@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: devscripts bts/2.22.1ubuntu1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) block 70456 with 45885 thanks
Received: (at control) by debbugs.gnu.org; 22 Apr 2024 09:49:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 22 05:49:32 2024 Received: from localhost ([127.0.0.1]:45702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ryqIl-0004uz-Jd for submit <at> debbugs.gnu.org; Mon, 22 Apr 2024 05:49:32 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:43840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1ryqIi-0004th-HA for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 05:49:29 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1ryqIM-00Ckjn-GY for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:49:06 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date; bh=bvGOSxnEBwIQiPIogTZLey5iIWGjppr9WpOK3TOGa+A=; b=APUj1QmvVcuj 1WIPeXa+/oc9Htbd+F4iLxH1AfGLNaLM21NJekxaJ0RjJ9yqNhQNVWcaHpJxAFSlz8XMo6/nwpIHD 2i6tpNIUAbbyrRy180jP76FJXZ/aphMOXw/Kc20csCecnqlGkq4FejbjCmIMeQHhdUVwkvltY1UBM 1W6ciVO6JaMCGHcRb26wtuFZSDrBbGrMK2Wzewh/37ZHV4N23FZzlrsMlSnT63XpqroN3e2ro96Mc GtZsV5CqlQAJ/Qi1CwBrNuGyJECHpbdT6Qo5AfJF+Ew/zRz6RyRGO5UWxjSGGeQld4f3KCRReuGNo 0nmPMMdLESDwkWrCmgxaxQ==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1ryqIH-0007CE-5J for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:49:01 +0200 Received: by submission03.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1ryqI0-00Hab2-JC for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:48:44 +0200 Date: Mon, 22 Apr 2024 10:48:43 +0100 From: Steve George <steve@HIDDEN> To: control <at> debbugs.gnu.org Subject: block 70456 with 40316 Message-ID: <1713779317-2200-bts-steve@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: devscripts bts/2.22.1ubuntu1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) block 70456 with 40316 thanks
Received: (at control) by debbugs.gnu.org; 22 Apr 2024 09:51:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 22 05:51:34 2024 Received: from localhost ([127.0.0.1]:45718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ryqKk-0005Ay-30 for submit <at> debbugs.gnu.org; Mon, 22 Apr 2024 05:51:34 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:55546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1ryqKi-0005AS-5I for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 05:51:32 -0400 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1ryqKM-00Ckzv-BA for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:51:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date; bh=8zTbl3AgM8/wwNgLO5o2vancrEtXAQcrMLBHqenind8=; b=ok00SCEKn6fd ZvcumqIzIbK3gYvEWw+EQASEBDhZ1vdLKp6xzGFjhHjszu54XRpQL+w7ycYpEZ8Utc+OlRfhnRHDk p7FuZEWqhHRHnmTEtPjKpKqXmfxGYlNYSafgcHDFH7q7WmHjGGeo/RqqyH5e59jEo6Xau/c1/3gBz b+auiy+LsXF1oBaZH0csH8jXAiq/870nwVbOfMJQi4FKKfRk8t74OAajmyF5xJ2bf0gpMSL5S8ctn fG6wwfer36Y/8sv/TICZJcihfDNBXPToO/B3vp6F4Y/VHmXuZbny6Xdw3XYeqP03fjhIX8ykBC4Nm lMni9eQd+S1hCQYqopG9Wg==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1ryqKL-0007mW-TJ for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:51:10 +0200 Received: by submission01.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1ryqKH-000LXW-R1 for control <at> debbugs.gnu.org; Mon, 22 Apr 2024 11:51:05 +0200 Date: Mon, 22 Apr 2024 10:51:05 +0100 From: Steve George <steve@HIDDEN> To: control <at> debbugs.gnu.org Subject: block 70456 with 68270 Message-ID: <1713779459-1387-bts-steve@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: devscripts bts/2.22.1ubuntu1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) block 70456 with 68270 thanks
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Request for merging "core-updates" branch
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Mon, 22 Apr 2024 17:32:01 +0000
Resent-Message-ID: <handler.70456.B70456.17138071087788 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: Christopher Baines <mail@HIDDEN>
Cc: 70456 <at> debbugs.gnu.org, steve@HIDDEN
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.17138071087788
(code B ref 70456); Mon, 22 Apr 2024 17:32:01 +0000
Received: (at 70456) by debbugs.gnu.org; 22 Apr 2024 17:31:48 +0000
Received: from localhost ([127.0.0.1]:46960 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ryxW6-00021N-Nr
for submit <at> debbugs.gnu.org; Mon, 22 Apr 2024 13:31:47 -0400
Received: from mail-oi1-x22f.google.com ([2607:f8b0:4864:20::22f]:58789)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1ryxW1-000203-1M
for 70456 <at> debbugs.gnu.org; Mon, 22 Apr 2024 13:31:45 -0400
Received: by mail-oi1-x22f.google.com with SMTP id
5614622812f47-3c7510d1bacso1345477b6e.1
for <70456 <at> debbugs.gnu.org>; Mon, 22 Apr 2024 10:31:24 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1713807079; x=1714411879; darn=debbugs.gnu.org;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=WUAY+RPOJ49cOvP8fuZ3rGi885YiPA/mH4oKHANG++Q=;
b=XBJt+Ejwe0oDFxFMfADasXapdK+yxYVbk237XuY8I0HAKGnvHWndiUtWE4b2Lh/QbN
3f1+AWQu6WebvKN7EYz8WUSahXByyiYcfckMTf2jTvB2zCxLceJ/he68BkCDZsEQJj1Q
r7UQjuJnnvuFSmfivjLMy230AiFfUobSGvwlajE1+mLQ0COzYNcX4cZ7151JSZD7u2Dh
XfsonNpOpFPX+aowLRfWCVJlFdrwjuREaxiNmEpZb2Ww2eyL54rTxzcUVonXzTAztD5Y
8Q0tSzmNk2Yk4paoK/pLP3wxlL4Kq3SdTkcPmEkJNRW8jubAVQoaz4CLcI2PImlKdRit
yMEw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1713807079; x=1714411879;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=WUAY+RPOJ49cOvP8fuZ3rGi885YiPA/mH4oKHANG++Q=;
b=Gm9kwEFM6SnScHG+QyGNCjv7X7kgmJvO4ssKAtCXMKOUBl4hMhTVKggpqgepGIRcsI
z8fJ4rNo+fLjg7mt0tNv/sjHKfdXYv3OR2smnyx+P2ggzeLoXppoP5S9PTna67q9YCod
HebT6mXUnzHYQ94J5Qbaoq1lMvJNqRqijwZ9O82uCfV1BRKL0h+wYi2Qf/NEPrjrU4Ng
zX4xYtU5YululDBnf+0FLZVgesSScOLQm8/C92Dz9aMjwKawDHe3Ii1NBXWAiIvzQ14r
5inMMZ8l+nUyraZu47ONPyRmHR7ebSdjxEW1PtvR0ZZMD+deFUSPkMLz12vR23gys4pk
oJ+Q==
X-Gm-Message-State: AOJu0YxB/ukgaVZH4sp9d9pOo3UqnpoeNa399Y1v3JDUDw5KBXcKH7+i
b1n7QhbCTYEkiRNA66lTZRTOt4YnI5PDnZelPA+MaOSzr4Bk34iv
X-Google-Smtp-Source: AGHT+IGqLnZIcGawQdv7MTza2Le8fB+laDgCKG0M+0uQ69wIjIAjA9klnEGOhUeuq5OIivuqkv4SJA==
X-Received: by 2002:a05:6808:1a0c:b0:3c8:2ce9:da35 with SMTP id
bk12-20020a0568081a0c00b003c82ce9da35mr5948578oib.6.1713807079179;
Mon, 22 Apr 2024 10:31:19 -0700 (PDT)
Received: from hurd (dsl-152-251.b2b2c.ca. [66.158.152.251])
by smtp.gmail.com with ESMTPSA id
w9-20020a0ca809000000b00696b1050be8sm3326074qva.133.2024.04.22.10.31.18
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 22 Apr 2024 10:31:18 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <87h6fv3o0t.fsf@HIDDEN> (Christopher Baines's message of
"Sat, 20 Apr 2024 19:08:34 +0100")
References: <ZiE0qcjXe5H_3XLT@dragon2> <87il0d4dn0.fsf@HIDDEN>
<877cgt47a1.fsf@HIDDEN> <87bk64j9h8.fsf@HIDDEN>
<87h6fv3o0t.fsf@HIDDEN>
Date: Mon, 22 Apr 2024 13:31:17 -0400
Message-ID: <87sezdgv8a.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi Christopher,
Christopher Baines <mail@HIDDEN> writes:
[...]
> Assuming we merge core-updates without doing anything about these
> duplicate commits, and taking the cwltool package as a semi-random
> example, if you do:
>
> git log -p gnu/packages/bioinformatics.scm
I trust the 'newest' (appearing first in 'git log --grep='cwltool:
Update') would yield the commit having substitutes?
If so, the inconvenience is somewhat mitigated, as long as you know to
use the newest of duplicated commits.
--
Thanks,
Maxim
Received: (at control) by debbugs.gnu.org; 23 Apr 2024 13:08:05 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 23 09:08:04 2024 Received: from localhost ([127.0.0.1]:52074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rzFsP-00049o-5J for submit <at> debbugs.gnu.org; Tue, 23 Apr 2024 09:08:03 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:49650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1rzFsH-00047R-Or for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 09:07:57 -0400 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1rzFru-00FqLg-Ve for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 15:07:31 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date; bh=Rbeonu8Raip6HPQPXQIU6aVveNkl9RLy/2joDxj8+O0=; b=UanDXQ7w4ooO zK57ZbKNkYPuh/73VtBomN6haItk2FLaELpu1tsrtauTvbx5AAGZojnbSUhthL9t1U7fr+BpClgbC srVgw8Pm+tPOJw3yyH1ZO2B4UL4IieDXXp/kvQdI1M+63bs2ZxksBPLN6grQYO/g8MdKgd5OjQbwU XoIWC0hgV3Lz45Y/pUz+tEJNWaiSI6+YorIlXVvHEh7MCfPLuac2acJAZRyadZxbl/DwFTNRNudKM m44d/flaqjHkV7MIETrOVoDS12vNDS3VrnbUCGbjkPAGz9LrS2s4a67NfBJ0DNX452OG9HVrULKDH V2sgwRcWDWU+ptqWQ3ubjA==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1rzFrr-0002hg-Fb for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 15:07:30 +0200 Received: by submission03.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rzFra-004SoW-N5 for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 15:07:10 +0200 Date: Tue, 23 Apr 2024 14:07:08 +0100 From: Steve George <steve@HIDDEN> To: control <at> debbugs.gnu.org Subject: block 70456 with 46442 Message-ID: <1713877622-2297-bts-steve@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: devscripts bts/2.22.1ubuntu1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) block 70456 with 46442 thanks
Received: (at control) by debbugs.gnu.org; 23 Apr 2024 15:24:07 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 23 11:24:06 2024 Received: from localhost ([127.0.0.1]:52787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rzI05-0007Ez-Jm for submit <at> debbugs.gnu.org; Tue, 23 Apr 2024 11:24:06 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:57578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1rzI02-0007DM-Oc for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 11:24:03 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1rzHzd-00G93K-W6 for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 17:23:38 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date; bh=voCb0+lSo0j+DbT+N6IL/89RCDnZOb9K/aeYkM7Rcec=; b=B5nrb3GCmWp/ d4puqRJpkIWGWopCpLGOJj30eUlV3lp1n4AG3Pv4H2JQqSImEFiyRsvtJaQpN2y84Jv9mHNBDWPYz tDksBkUnf66BzA4gPCE0Tf1axplKses7XKlyCW45dDi9YLi13MdKSWcDoaAsaD7TxCoQP32pWiw0m 3u58cfuXFurfowH2meKKHUvWg9SetzXH2U2/v1iCo+0sFtTsnGm+gOAl6bSDJ2BzfM56uYCrpzJkh 4Zbf++8WgmUsoOvGemnnRKhMhR63Qm4AMx3YuRxDBDnUUdn0rYjB4LfRyt9fBpTfAcUoRmfZo2lIp HwXRk7rk3dG2zOr3ujvCIg==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1rzHzd-0002tM-II for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 17:23:37 +0200 Received: by submission01.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rzHzP-005Bsm-T8 for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 17:23:24 +0200 Date: Tue, 23 Apr 2024 16:23:23 +0100 From: Steve George <steve@HIDDEN> To: control <at> debbugs.gnu.org Subject: block 70456 with 70537 Message-ID: <1713885799-1346-bts-steve@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: devscripts bts/2.22.1ubuntu1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) block 70456 with 70537 thanks
Received: (at control) by debbugs.gnu.org; 23 Apr 2024 16:34:10 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 23 12:34:08 2024 Received: from localhost ([127.0.0.1]:53181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1rzJ5p-0006QH-AT for submit <at> debbugs.gnu.org; Tue, 23 Apr 2024 12:34:08 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:38686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <steve@HIDDEN>) id 1rzJ5P-0006BY-S8 for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 12:33:43 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from <steve@HIDDEN>) id 1rzJ53-00GHd7-1G for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 18:33:17 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: To:From:Date; bh=wNb13PuhI+ilWNPJFKKnVNrmiOXeMvwaFT+wUSkRmr8=; b=cURTB8nonTdr iMXzbOQdhzIMrot/2udCS+xQT0ZPSKfWHqlMIT8AxILfGHj3Om9o0BbhkzAOKuQYzOxA8vwoHXLKC g+Q7VEfajfe12FnVPmkP23lHJVzFcet2lGdKnvjh7wDOd70+WoYsBMhphOJRJYgDCCarP5KilSG43 Xp/JnVl/aOjmvvwqxaXe0aynZz1+H/neLsVMw/9k0s6lGm9851uJJRvZQq3NlC2SXtgPd1nhGqILy pcVgVRC34TtxompDazmgFi+g1FgMl8QyKLopMyqkNanK+6kwULO0G8P564pMXHDODFp4xPWTTdJol P9anYG61BThQjG+C3Tee+g==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from <steve@HIDDEN>) id 1rzJ52-000159-L4 for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 18:33:16 +0200 Received: by submission01.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rzJ4k-005Lnw-Bm for control <at> debbugs.gnu.org; Tue, 23 Apr 2024 18:32:58 +0200 Date: Tue, 23 Apr 2024 17:32:57 +0100 From: Steve George <steve@HIDDEN> To: control <at> debbugs.gnu.org Subject: block 70456 with 39415 Message-ID: <1713889973-3525-bts-steve@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: devscripts bts/2.22.1ubuntu1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) block 70456 with 39415 thanks
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Request for merging "core-updates" branch
References: <ZiE0qcjXe5H_3XLT@dragon2>
In-Reply-To: <ZiE0qcjXe5H_3XLT@dragon2>
Resent-From: tumashu <tumashu@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Fri, 26 Apr 2024 14:45:03 +0000
Resent-Message-ID: <handler.70456.B70456.17141426983557 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: 70456 <at> debbugs.gnu.org
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.17141426983557
(code B ref 70456); Fri, 26 Apr 2024 14:45:03 +0000
Received: (at 70456) by debbugs.gnu.org; 26 Apr 2024 14:44:58 +0000
Received: from localhost ([127.0.0.1]:38189 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s0Moq-0000v2-PU
for submit <at> debbugs.gnu.org; Fri, 26 Apr 2024 10:44:57 -0400
Received: from m16.mail.163.com ([220.197.31.2]:55512)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <tumashu@HIDDEN>) id 1s0Mol-0000sr-W9
for 70456 <at> debbugs.gnu.org; Fri, 26 Apr 2024 10:44:55 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com;
s=s110527; h=Date:From:Subject:Content-Type:MIME-Version:
Message-ID; bh=UvIFrCm3yMnPwCE2l71qf4rl+FecQTCv1WHsTpBrNXE=; b=S
UNOGoqHL+5FbaJTyeq7+MHXmXCTJMFu9jGlgkn+XFCzZ17sQC494RZ52qH68QYkG
KicXITr//xjgEwl1fE5CZeXyl/Lrw3HNxEcAP/bKzfprZnbT/GVjgUgHh/AQx89Z
zgvWFWDVesVvVoqRQa7UTzEAX3ZxdP1Rm/pxgHFrZI=
Received: from tumashu$163.com ( [106.111.214.140] ) by
ajax-webmail-wmsvr-40-100 (Coremail) ; Fri, 26 Apr 2024 22:44:26 +0800
(CST)
X-Originating-IP: [106.111.214.140]
Date: Fri, 26 Apr 2024 22:44:26 +0800 (CST)
From: tumashu <tumashu@HIDDEN>
X-Priority: 3
X-Mailer: Coremail Webmail Server Version XT5.0.14 build 20230109(dcb5de15)
Copyright (c) 2002-2024 www.mailtech.cn 163com
X-NTES-SC: AL_Qu2aBv2fvU4t4CKaZulS6TNg5ap/Aovi05paj8cQVuwuiRHK1y0wWEdRM2Df18OplfniyaJeKw00CzAejLER
Content-Type: multipart/alternative;
boundary="----=_Part_270973_1338595688.1714142666232"
MIME-Version: 1.0
Message-ID: <24c1b4b1.25ee.18f1add5df8.Coremail.tumashu@HIDDEN>
X-Coremail-Locale: zh_CN
X-CM-TRANSID: _____wDnL5zKvStmRfUwAA--.43591W
X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiLx7M1GVODSavNQADsw
X-Coremail-Antispam: 1U5529EdanIXcx71UUUUU7vcSsGvfC2KfnxnUU==
X-Spam-Score: 2.2 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: emacs has a script gitmerge.el, it can skip some commit when
merge with different merge rule (ours),
maybe can make life easier:
https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/gitmerge.el
https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/notes/git-workflow
Content analysis details: (2.2 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL,
https://senderscore.org/blocklistlookup/
[220.197.31.2 listed in bl.score.senderscore.com]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [220.197.31.2 listed in list.dnswl.org]
0.9 RCVD_IN_MSPIKE_L3 RBL: Low reputation (-3)
[220.197.31.2 listed in bl.mailspike.net]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (tumashu[at]163.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 HTML_MESSAGE BODY: HTML included in message
0.0 RCVD_IN_MSPIKE_BL Mailspike blocklisted
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 1.2 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: emacs has a script gitmerge.el, it can skip some commit when
merge with different merge rule (ours), maybe can make life easier: https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/gitmerge.el
https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/notes/git-workflow
Content analysis details: (1.2 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust
[220.197.31.2 listed in list.dnswl.org]
0.9 RCVD_IN_MSPIKE_L3 RBL: Low reputation (-3)
[220.197.31.2 listed in bl.mailspike.net]
1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL,
https://senderscore.org/blocklistlookup/
[220.197.31.2 listed in bl.score.senderscore.com]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (tumashu[at]163.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 HTML_MESSAGE BODY: HTML included in message
0.0 RCVD_IN_MSPIKE_BL Mailspike blocklisted
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
------=_Part_270973_1338595688.1714142666232
Content-Type: text/plain; charset=gbk
Content-Transfer-Encoding: base64
CmVtYWNzIGhhcyBhIHNjcmlwdCBnaXRtZXJnZS5lbCwgaXQgY2FuIHNraXAgc29tZSBjb21taXQg
d2hlbiBtZXJnZSB3aXRoIGRpZmZlcmVudCBtZXJnZSBydWxlIChvdXJzKSwgbWF5YmUgY2FuIG1h
a2UgbGlmZSBlYXNpZXI6CgoKaHR0cHM6Ly9naXQuc2F2YW5uYWguZ251Lm9yZy9jZ2l0L2VtYWNz
LmdpdC90cmVlL2FkbWluL2dpdG1lcmdlLmVsCgoKaHR0cHM6Ly9naXQuc2F2YW5uYWguZ251Lm9y
Zy9jZ2l0L2VtYWNzLmdpdC90cmVlL2FkbWluL25vdGVzL2dpdC13b3JrZmxvdwoKCgoKCgoKCgoK
Ci0tCrei19TO0rXEzfjS19PKz+TK1rv61sfE3LDm
------=_Part_270973_1338595688.1714142666232
Content-Type: text/html; charset=gbk
Content-Transfer-Encoding: base64
PGJyPmVtYWNzIGhhcyBhIHNjcmlwdCBnaXRtZXJnZS5lbCwgaXQgY2FuIHNraXAgc29tZSBjb21t
aXQgd2hlbiBtZXJnZSB3aXRoIGRpZmZlcmVudCBtZXJnZSBydWxlIChvdXJzKSwgbWF5YmUgY2Fu
IG1ha2UgbGlmZSBlYXNpZXI6PGJyPjxicj48ZGl2Pmh0dHBzOi8vZ2l0LnNhdmFubmFoLmdudS5v
cmcvY2dpdC9lbWFjcy5naXQvdHJlZS9hZG1pbi9naXRtZXJnZS5lbDwvZGl2PjxkaXY+PGJyPjwv
ZGl2PjxkaXY+aHR0cHM6Ly9naXQuc2F2YW5uYWguZ251Lm9yZy9jZ2l0L2VtYWNzLmdpdC90cmVl
L2FkbWluL25vdGVzL2dpdC13b3JrZmxvdzxicj48L2Rpdj48ZGl2Pjxicj48L2Rpdj48ZGl2Pjxi
cj48YnI+PC9kaXY+PGJyPjxicj48YnI+PGJyPjxkaXYgaWQ9InNwbkVkaXRvclNpZ25fYXBwIj4t
LTxicj63otfUztK1xM340tfTys/kyta7+tbHxNyw5jwvZGl2Pg==
------=_Part_270973_1338595688.1714142666232--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Request for merging "core-updates" branch
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Thu, 02 May 2024 07:54:02 +0000
Resent-Message-ID: <handler.70456.B70456.17146364298688 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: Christopher Baines <mail@HIDDEN>
Cc: Guix Devel <guix-devel@HIDDEN>, Josselin Poiret <dev@HIDDEN>, 70456 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.17146364298688
(code B ref 70456); Thu, 02 May 2024 07:54:02 +0000
Received: (at 70456) by debbugs.gnu.org; 2 May 2024 07:53:49 +0000
Received: from localhost ([127.0.0.1]:42185 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s2RGH-0002G3-5H
for submit <at> debbugs.gnu.org; Thu, 02 May 2024 03:53:49 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51242)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1s2RGF-0002Fl-1N
for 70456 <at> debbugs.gnu.org; Thu, 02 May 2024 03:53:48 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1s2RFn-0002OO-Ew; Thu, 02 May 2024 03:53:19 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=oc98J34okN06ritL+/7GMUdoEO2d93a71SMBabxs0DM=; b=oB/9gvolAQyUJqu7PUxc
QxPg09scdRmk6UM79geOyNGCHvg87yaAAdimu2SJUTWw07VN7mU3pyGoYcA3kP2y368fVY4tpiYSF
HeoYcE2W9PS4FA8nqk9RY2rUZ5ZMRtI1nLov7BuPktqvpK01mLQhpH6XEe+w0FO6jkZBObhYCPylO
8yP8EBrty910+VgwsmApxbb0Oot1vwcgyG/IgX691D/xM6F2LM4eZpmmws7RsqbnKN+enGxuyX+24
jwMAEbIe3JxZoWj7PwZetGNZFv+zT1n+F8HSprdiWSBNm6K/cbW48WwJcz4yFoMALllV3qbLODp/3
gJX2B2q/inAqrw==;
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
In-Reply-To: <87mspo2sme.fsf@HIDDEN> (Christopher Baines's message of
"Sat, 20 Apr 2024 12:14:33 +0100")
References: <87edbzri2p.fsf@HIDDEN> <87mspo2sme.fsf@HIDDEN>
Date: Thu, 02 May 2024 09:53:14 +0200
Message-ID: <8734r03b11.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi Chris and all,
Christopher Baines <mail@HIDDEN> skribis:
> I think keeping the Git commit history clean and representative is
> really important, so to me at least this means core-updates can't be
> merged to master in it's current form, even if the changes overall from
> these 6351 commits are reasonable.
>
> I'm really not sure how to move forward though, I had a go at trying to
> rebuild the branch without introducing the thousands of duplicate
> commits and that produced a branch with 765 commits over master, which
> still seems a lot, but a big improvement over 6351:
>
> https://git.cbaines.net/guix/log/?h=3Dchris-core-updates-no-duplicates-=
attempt
>
> That was really hard going though, as there's plenty of merge conflicts
> along the way, and I'm pretty sure I solved some of them
> incorrectly. The resulting branch also differs from core-updates.
Woow, impressive. How did you go about finding which commits were
duplicates/cherry-picked from master? Which commit did you start from?
Given everything you=E2=80=99ve explained, it seems to me it=E2=80=99s wort=
h trying to
start from a clean branch like this.
I checked it out (commit da77ea23daa0bfa4a73290dff99b22d6825ff80b) to
get an idea of where we are and got this:
--8<---------------cut here---------------start------------->8---
make[2]: *** No rule to make target 'gnu/packages/patches/glib-networking-g=
nutls-binding.patch', needed by 'all-am'.
make[2]: *** No rule to make target 'gnu/packages/patches/librecad-support-=
for-boost-1.76.patch', needed by 'all-am'.
--8<---------------cut here---------------end--------------->8---
It stopped at:
--8<---------------cut here---------------start------------->8---
gnu/packages/sdl.scm:72:2: error: (package (name "sdl2") (version "2.30.1")=
(source (origin (method url-fetch) (uri (string-append "https://libsdl.org=
/release/SDL2-" version ".tar.gz")) (sha256 (base32 "0fj7gxc7rlzzrafnx9nmf7=
ws3paxy583fmx7bcbavi6gr3xmy881")))) (arguments (list #:tests? #f #:configur=
e-flags (gexp (append (quote ("--disable-wayland-shared" "--enable-video-km=
sdrm" "--disable-kmsdrm-shared")) (quote ("--disable-alsa-shared" "--disabl=
e-pulseaudio-shared" "--disable-x11-shared" "LDFLAGS=3D-lGL")))) #:make-fla=
gs (gexp (cons* (string-append "LDFLAGS=3D-Wl,-rpath," (ungexp (this-packag=
e-input "eudev")) "/lib" ",-rpath," (ungexp (this-package-input "vulkan-loa=
der")) "/lib") (quote ("V=3D1")))))) (propagated-inputs (list libx11 libcap=
mesa)) (native-inputs (list pkg-config)) (inputs (list libxrandr glu alsa-=
lib pulseaudio dbus eudev glib ibus-minimal libxkbcommon libxcursor vulkan-=
loader wayland wayland-protocols)) (outputs (quote ("out" "debug"))) (synop=
sis "Cross platform game development library") (description "Simple DirectM=
edia Layer is a cross-platform development library designed to\nprovide low=
level access to audio, keyboard, mouse, joystick, and graphics\nhardware."=
) (home-page "https://libsdl.org/") (license license:bsd-3)): missing field=
initializers (build-system)
--8<---------------cut here---------------end--------------->8---
I guess these are merge conflicts that weren=E2=80=99t correctly resolved.
This branch rewrites the entire =E2=80=98core-updates=E2=80=99 history. Wh=
at about
rewriting starting from the first series of =E2=80=9Cduplicate=E2=80=9D com=
mits? That
should solve the immediate issue while keeping the =E2=80=9Cknown good=E2=
=80=9D history?
Thanks,
Ludo=E2=80=99.
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: Process gnome-team before core-updates
References: <ZiE0qcjXe5H_3XLT@dragon2>
In-Reply-To: <ZiE0qcjXe5H_3XLT@dragon2>
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Wed, 08 May 2024 12:04:01 +0000
Resent-Message-ID: <handler.70456.B70456.171516984032167 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: control <at> debbugs.gnu.org
Cc: 70766 <at> debbugs.gnu.org, 70456 <at> debbugs.gnu.org
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.171516984032167
(code B ref 70456); Wed, 08 May 2024 12:04:01 +0000
Received: (at 70456) by debbugs.gnu.org; 8 May 2024 12:04:00 +0000
Received: from localhost ([127.0.0.1]:48505 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s4g1g-0008Mk-IK
for submit <at> debbugs.gnu.org; Wed, 08 May 2024 08:04:00 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43426)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>)
id 1s4g1e-0008MY-Ai; Wed, 08 May 2024 08:03:59 -0400
Received: from localhost (unknown [212.132.255.10])
by mira.cbaines.net (Postfix) with ESMTPSA id ECAA027BBE2;
Wed, 8 May 2024 13:03:31 +0100 (BST)
Received: from felis (localhost.lan [127.0.0.1])
by localhost (OpenSMTPD) with ESMTP id a4f08193;
Wed, 8 May 2024 12:03:31 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
User-Agent: mu4e 1.12.2; emacs 29.3
Date: Wed, 08 May 2024 13:03:29 +0100
Message-ID: <87pltwfr3i.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
block 70456 by 70766
thanks
I think being able to merge core-updates is still a few weeks away, so I
think there's time to build and merge gnome-team without delaying
core-updates.
If it does become a problem, we can always switch approach and wait
until after core-updates is merged to look at gnome-team.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmY7ahFfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xc7hxAAjl4tflCbDrQvwjrFgZajJlTLzQeQmnrf
daUNdE2lrSKcQigosYWH8NtUpNBvD+Cw/mev20E70sxa33avWomL2/jJ/gkMPAqY
o58lj1VIlxVXPMx+1DDxq8MZsPtGsFuUyLO1hmvS8xxZu48IGy3ye1V/cAPc3Hkb
/LCSkr+u4JZV7BePSrzS0pGYxQ6ELcAZlvpb4kANoUTwNP3fnXIZI0LabwyUxCga
qgPLX8COe6gEbk0JIQFGq1maBIYSCU+Ws9wBCwUe4GDm+emdeU1rFfxKYXCFDFwh
akmE7UInARxk0gXI3+aUcpeCU5MA1eozXvIiLK2Vv9NFKF1VieQrpk3t2utZIpOh
OmYhNiVJrTWKhzHJ9U22Uj3hF+C0F13tZuDMVzwuc9Ssy/FGVQGCjmcDEGoeVxG1
XLB/wCiqGd1CPJ2kEIqDuro5VIiTNAt7R8PKa6X7l9tqH4LreigLu4Y5FvTSVCWC
dZsPSuUhPSLPROGU5bZMwq654tFosAlGfB5X1LJpvKwfLjmK2qwFy5ZdXgQwyA2p
utpk4zxEc6/bPkCzt51lFOnh3p8p9J08Keq3UT3nr+FSamr3ZsZLs0v5NeZ0VJVV
SnfPZsMCvO8Y+LdVcAqdkJTjFbvCSBeE0OWAukb6M14X0/OinhUV0V2Az65NWnnx
3O4vDn6EKR4=
=XciC
-----END PGP SIGNATURE-----
--=-=-=--
Received: (at control) by debbugs.gnu.org; 8 May 2024 12:04:16 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 08 08:04:16 2024 Received: from localhost ([127.0.0.1]:48511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s4g1w-0008NK-1L for submit <at> debbugs.gnu.org; Wed, 08 May 2024 08:04:16 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1s4g1e-0008MY-Ai; Wed, 08 May 2024 08:03:59 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id ECAA027BBE2; Wed, 8 May 2024 13:03:31 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a4f08193; Wed, 8 May 2024 12:03:31 +0000 (UTC) From: Christopher Baines <mail@HIDDEN> To: control <at> debbugs.gnu.org Subject: Process gnome-team before core-updates User-Agent: mu4e 1.12.2; emacs 29.3 Date: Wed, 08 May 2024 13:03:29 +0100 Message-ID: <87pltwfr3i.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control Cc: 70766 <at> debbugs.gnu.org, 70456 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain block 70456 by 70766 thanks I think being able to merge core-updates is still a few weeks away, so I think there's time to build and merge gnome-team without delaying core-updates. If it does become a problem, we can always switch approach and wait until after core-updates is merged to look at gnome-team. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmY7ahFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xc7hxAAjl4tflCbDrQvwjrFgZajJlTLzQeQmnrf daUNdE2lrSKcQigosYWH8NtUpNBvD+Cw/mev20E70sxa33avWomL2/jJ/gkMPAqY o58lj1VIlxVXPMx+1DDxq8MZsPtGsFuUyLO1hmvS8xxZu48IGy3ye1V/cAPc3Hkb /LCSkr+u4JZV7BePSrzS0pGYxQ6ELcAZlvpb4kANoUTwNP3fnXIZI0LabwyUxCga qgPLX8COe6gEbk0JIQFGq1maBIYSCU+Ws9wBCwUe4GDm+emdeU1rFfxKYXCFDFwh akmE7UInARxk0gXI3+aUcpeCU5MA1eozXvIiLK2Vv9NFKF1VieQrpk3t2utZIpOh OmYhNiVJrTWKhzHJ9U22Uj3hF+C0F13tZuDMVzwuc9Ssy/FGVQGCjmcDEGoeVxG1 XLB/wCiqGd1CPJ2kEIqDuro5VIiTNAt7R8PKa6X7l9tqH4LreigLu4Y5FvTSVCWC dZsPSuUhPSLPROGU5bZMwq654tFosAlGfB5X1LJpvKwfLjmK2qwFy5ZdXgQwyA2p utpk4zxEc6/bPkCzt51lFOnh3p8p9J08Keq3UT3nr+FSamr3ZsZLs0v5NeZ0VJVV SnfPZsMCvO8Y+LdVcAqdkJTjFbvCSBeE0OWAukb6M14X0/OinhUV0V2Az65NWnnx 3O4vDn6EKR4= =XciC -----END PGP SIGNATURE----- --=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: branch core-updates updated (c8c6883398 -> 0e06c9697a)
Resent-From: Efraim Flashner <efraim@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sun, 09 Jun 2024 09:56:02 +0000
Resent-Message-ID: <handler.70456.B70456.171792695423539 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: Christopher Baines <mail@HIDDEN>
Cc: guix-devel@HIDDEN, 70456 <at> debbugs.gnu.org
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.171792695423539
(code B ref 70456); Sun, 09 Jun 2024 09:56:02 +0000
Received: (at 70456) by debbugs.gnu.org; 9 Jun 2024 09:55:54 +0000
Received: from localhost ([127.0.0.1]:56252 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sGFHF-00067a-JP
for submit <at> debbugs.gnu.org; Sun, 09 Jun 2024 05:55:53 -0400
Received: from mail-wm1-f48.google.com ([209.85.128.48]:55349)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <efraim.flashner@HIDDEN>) id 1sGFHD-000674-ET
for 70456 <at> debbugs.gnu.org; Sun, 09 Jun 2024 05:55:52 -0400
Received: by mail-wm1-f48.google.com with SMTP id
5b1f17b1804b1-4217136a74dso14471505e9.2
for <70456 <at> debbugs.gnu.org>; Sun, 09 Jun 2024 02:55:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1717926869; x=1718531669; darn=debbugs.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=DlMaLOYXGgpO5g+qXGyQPV8MzBA/vXAsq53XIg3a/X+j1eJbE6OjaaKSYI9/46c9BN
H9GIi29k1dZA07yTfjOU/scmmRW2QefLITJcq3eDWFVq3YD70+7H2EWnh+A7UhDNjljv
1fVOOHiX/AWogkxnh2UX1Aw+dbxowH8cgHUMxtoDJzxChoJ3snzm3pl2YHixkWZ7kaK/
gPhiqrWmVek+xrQeC74qXvU+5LJzaGZMJDq6Vr4msfiYHF/ZTqRytb6cRyJBhJzKrPZ4
8e0suS0XnwSOH8bpbq0iX+0CQobTRTfzag/nRU+iyUf39EXZBo9Ivwk07a3J5RUtx2mg
1E1Q==
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=bc3Tu/i8GfyleBKzBxL3b9I092E5UEb76g+DQlDSm24r4GSBtmSV5if9BYd1kjMMEk
4ueX9vLObzhM16jdeK8WlNEPcULVGj+TegDnJEG34+wcxcnqTNKlPt2tvRX867vNwQ+J
kH+rBcrJct13Xz9Ctm/SyCTqiYC5Z0eXyc6zZGBfKrMBNRL21UvusOFrYjRFJZpLN1pI
KeBBITr4UbbEmnNAaQzeeuGq1pRfkJKmWrg6OrTh1KwchJT5OnlgFvFXJm47Cj7279U0
tdjuFHiDoTH9F5JY28Ds+ZuclhXEqwmnBcEcV+u2eN+8tDD9IZ8ifTA8/ApSmHjPUAZ8
vPFQ==
X-Forwarded-Encrypted: i=1;
AJvYcCWgjQIdCcIsfe61TwmK+uTR+Zs5akxjbEAwdDVEKcH10D2aUuOBVYVh+n+29FLHzKVx1rEs5BMpaCohrLY0muzBJ0a8lec=
X-Gm-Message-State: AOJu0YwTzCzWeJPauNbbGCLYqi1PirfLCMvcJJAwTw5LFYP4I/wGzuA4
1OZJvxTGxyzkzhY0nTKZ7fh1l/1KO2yynrTQvrpBEFYkbzv5aXSC
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 <efraim@HIDDEN>
Message-ID: <ZmV706i6uTb69V1Q@3900XT>
Mail-Followup-To: Christopher Baines <mail@HIDDEN>, guix-devel@HIDDEN,
70456 <at> debbugs.gnu.org
References: <171792086189.17847.16499633131068637226@HIDDEN>
<87jziy1mal.fsf@HIDDEN>
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@HIDDEN>
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
X-Spam-Score: 0.2 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)
--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@HIDDEN 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 <efraim@HIDDEN> =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--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: branch core-updates updated (c8c6883398 -> 0e06c9697a)
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sun, 09 Jun 2024 09:57:01 +0000
Resent-Message-ID: <handler.70456.B70456.171792697923646 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: guix-devel@HIDDEN, Efraim Flashner <efraim@HIDDEN>, 70456 <at> debbugs.gnu.org
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.171792697923646
(code B ref 70456); Sun, 09 Jun 2024 09:57:01 +0000
Received: (at 70456) by debbugs.gnu.org; 9 Jun 2024 09:56:19 +0000
Received: from localhost ([127.0.0.1]:56275 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sGFHe-00069K-QF
for submit <at> debbugs.gnu.org; Sun, 09 Jun 2024 05:56:19 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43616)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>) id 1sGFHd-000697-33
for 70456 <at> debbugs.gnu.org; Sun, 09 Jun 2024 05:56:17 -0400
Received: from localhost (unknown [212.132.255.10])
by mira.cbaines.net (Postfix) with ESMTPSA id 10D0527BBE2;
Sun, 9 Jun 2024 10:46:13 +0100 (BST)
Received: from felis (localhost.lan [127.0.0.1])
by localhost (OpenSMTPD) with ESMTP id a5d40817;
Sun, 9 Jun 2024 09:46:12 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
In-Reply-To: <171792086189.17847.16499633131068637226@HIDDEN>
(guix-commits@HIDDEN's message of "Sun, 9 Jun 2024 04:14:22 -0400
(EDT)")
References: <171792086189.17847.16499633131068637226@HIDDEN>
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Sun, 09 Jun 2024 10:46:10 +0100
Message-ID: <87jziy1mal.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
guix-commits@HIDDEN writes:
> 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.
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).
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.
To fix this, I think we should rebase core-updates on master and drop
these commits.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZleeJfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XcjMxAArwbYGwBczYAsqb1OsRC58fC9vJd+lBLV
eopXKjghcwEai0gm6J10s7KnIneIm9M6ety1TX6ELvUl4qHrj+FFi5hZTaneqcxs
+axs3SYCcZ+HWqL1lH03hGVFLJosZ273944JJxAUiCi5iRR5CbffKcukyqCt7dHG
p90M/60aDr2hsVBWj4EN3kzR5EyO9Pg3zBLJEilJ6pbokbnrxy3gGjXUtIN89fTE
9ZVkWAn52GUFYNPzNnBUEz89DgNqlcavL3oGSwuG6x6ge8q9LrHHC/5zlyhif1iO
8blg5RxO2tZfta6OEP2HfOz3ewJCyjoi7OWjKJ6Z38RGECTaLq5ZU+FNkLp/H0Lr
J4MUGvC66XzQzCdH60SBdUtnCpgv3PqnodUBP8QXdzRJhvd24jCxVS2/76RML1Od
HUih7PDwGqFa6DvSCkbekIGN+w910MtCTHhgdmVBr8/t9cBzhmYuqJ2TcC7yJfgI
d+Ag8jOScFfweIX2yLYbQpsrKsJ50cjJz1d0cHkvBU5V11xt7sVKiBWSSHQYR9P+
pSd6gnscxbGq1HTEeIcZRzak5+8AH32CLC2pohuwwKU8ACaKSWhZwPQbuqb8Tp+3
GaYkjLb7208Thm5uMJt+1CxOy6bxTjquwxFjkl5i/1PnY5yMQj5QDWvH0MupM3GX
wa8CFnqFbN8=
=Cecn
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: branch core-updates updated (c8c6883398 -> 0e06c9697a)
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sun, 09 Jun 2024 10:22:01 +0000
Resent-Message-ID: <handler.70456.B70456.171792847628264 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: guix-devel@HIDDEN, efraim@HIDDEN
Cc: 70456 <at> debbugs.gnu.org
Received: via spool by 70456-submit <at> debbugs.gnu.org id=B70456.171792847628264
(code B ref 70456); Sun, 09 Jun 2024 10:22:01 +0000
Received: (at 70456) by debbugs.gnu.org; 9 Jun 2024 10:21:16 +0000
Received: from localhost ([127.0.0.1]:57445 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sGFfn-0007Lm-DF
for submit <at> debbugs.gnu.org; Sun, 09 Jun 2024 06:21:15 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43618)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>) id 1sGFfl-0007LT-63
for 70456 <at> debbugs.gnu.org; Sun, 09 Jun 2024 06:21:13 -0400
Received: from localhost (unknown [212.132.255.10])
by mira.cbaines.net (Postfix) with ESMTPSA id E19D427BBE2;
Sun, 9 Jun 2024 11:20:55 +0100 (BST)
Received: from felis (localhost.lan [127.0.0.1])
by localhost (OpenSMTPD) with ESMTP id 92ec7930;
Sun, 9 Jun 2024 10:20:55 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
In-Reply-To: <ZmV706i6uTb69V1Q@3900XT> (Efraim Flashner's message of "Sun, 9
Jun 2024 12:54:27 +0300")
References: <171792086189.17847.16499633131068637226@HIDDEN>
<87jziy1mal.fsf@HIDDEN> <ZmV706i6uTb69V1Q@3900XT>
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Sun, 09 Jun 2024 11:20:53 +0100
Message-ID: <87frtm1koq.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Efraim Flashner <efraim@HIDDEN> writes:
> On Sun, Jun 09, 2024 at 10:46:10AM +0100, Christopher Baines wrote:
>> guix-commits@HIDDEN 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.
You're right regarding drift, but unfortunately I think this duplication
of commits creates merge conflicts, or at least makes them much more
likely.
> What is the correct way to apply a patch to multiple branches?
I'd frame the problem differently, we don't want multiple branches, we
want everything on master. Unfortunately for some changes that is hard
to test and creates too much churn, so for those changes they go to a
branch where they can be built and tested prior to pushing/merging them
to master.
To avoid changes happening on a topic branch and master, I think it's
important that any change that can be made on master, is made on
master. That should avoid the problem where someone else comes along and
doesn't realise a change has been made on core-updates, and duplicates
that on master. In this instance, you pushed the changes to master,
which is great.
I realise it does require more up front effort, but if you see a failing
build on a topic branch that's fixed by some change on master, the topic
branch should be rebased to include those changes. Providing it's done
correctly, merging should be fine as well, but the docs now say to avoid
that and prefer rebasing (mostly because of how merging has introduced
duplicate commits in to core-updates)
This rebasing or merging will minimise the drift between the two
branches as well, while avoiding Git conflicts and commit duplication.
So I don't think we want to be applying patches to multiple branches. If
it can be applied to master, it should be applied there, then all the
branches should be rebased to include it.
Does that make sense? This isn't really a "doing it wrong" thing, more
that we need to try and optimise the process for managing branches. I
haven't got a concise definition of what we're trying to optimise for,
but in this instance we want to avoid Git issues like merge conflicts
and avoid duplication and complexity by making changes that can be made
on master, just on master.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZlggVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XfRJQ/7B6KRFV4aTJhTsvzsx3XFBp2aMS1VWIOX
hVOuEC89bMqixerzfBe7dPqyt/8SYPetD3dV2EHR5MqPrpQO1r0e5T9yJlab3ehc
Wy+JIQySy3KbtiSH4dDILyld/sJ7TVbC/YS/zBFPghFT+/egV0DzOvasvFUNKLzS
ggzMDJxT5SssgQMAV2SnNOV9FDEkw4Ubmk0nqeladGTzAm4n1ajMomMNAlw8dV9y
/TOnwevnuIKY6lx0aY52Y6qpiLGh510Nc8xaPQqXkBtulGq1Tes8s4nmft7zkNg3
vKRYThfPJ2ymMXtPZmpmNqB/Iy0pdO/g1TX6e5lYq+eXqoq9qLFPURAKrAt1w9B8
2ri8dpRO7WinKVr/g9k6XNf4r2HaUCtqxYpTxrUQnyFR0VJL+tli22CAJ39eLNfJ
gKS3dCnhJyfCSAL43wWdcShIzNjIiHLfPOEvQor7P6lkYi7n5/8EUaPGm8yH2wWY
bSvRefUanIx9Edv8mjVgMMmfUnyQ/9iRiapOkKxmf80y39aNlJSWk2MOTvdwP3v3
5P8Q7IdVg+Wt/xerUdnPrLcZfUuQn0sPSvZRW4zRIGF7xA6ufn4spj0ptnyCqLZN
utYJUQIre3WKMJPsicYY6DSFOl0QxmQFttX52/H2quG/9/b2LfR0J+dsgVX7pfoO
R53lYSeUIQ4=
=vWmK
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: bug#70456: branch core-updates updated (c8c6883398 -> 0e06c9697a)
Resent-From: Christopher Baines <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-guix@HIDDEN
Resent-Date: Sun, 09 Jun 2024 12:41:04 +0000
Resent-Message-ID: <handler.70456.B70456.171793683431201 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70456
X-GNU-PR-Package: guix
X-GNU-PR-Keywords:
To: 70456 <at> debbugs.gnu.org
Received: via spool by 70456-submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sGHqb-000871-Br
for submit <at> 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 <mail@HIDDEN>) id 1sGGoU-0005DO-NO
for 70456 <at> 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 <at> 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 <at> debbugs.gnu.org>; Sun, 9 Jun 2024 11:34:00 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
In-Reply-To: <87frtm1koq.fsf@HIDDEN> (Christopher Baines's message of
"Sun, 09 Jun 2024 11:20:53 +0100")
References: <171792086189.17847.16499633131068637226@HIDDEN>
<87jziy1mal.fsf@HIDDEN> <ZmV706i6uTb69V1Q@3900XT>
<87frtm1koq.fsf@HIDDEN>
User-Agent: mu4e 1.12.4; emacs 29.3
Date: Sun, 09 Jun 2024 12:34:00 +0100
Message-ID: <87bk4a1hav.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Christopher Baines <mail@HIDDEN> writes:
> Efraim Flashner <efraim@HIDDEN> writes:
>
>> On Sun, Jun 09, 2024 at 10:46:10AM +0100, Christopher Baines wrote:
>>> guix-commits@HIDDEN 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-----
--=-=-=--
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.