GNU bug report logs - #70456
Request for merging "core-updates" branch

Message received at 70456 <at> debbugs.gnu.org:

Received: (at 70456) by debbugs.gnu.org; 22 Apr 2024 17:31:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 22 13:31:48 2024
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>
To: Christopher Baines <mail@HIDDEN>
Subject: Re: bug#70456: Request for merging "core-updates" branch
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-Debbugs-Envelope-To: 70456
Cc: 70456 <at> debbugs.gnu.org, steve@HIDDEN
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

Message received at 70456 <at> debbugs.gnu.org:

Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 21:15:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 20 17:15:32 2024
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>
To: Christopher Baines <mail@HIDDEN>
Subject: Re: Status of =?utf-8?Q?=E2=80=98core-updates=E2=80=99?=
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-Debbugs-Envelope-To: 70456
Cc: Guix Devel <guix-devel@HIDDEN>,
 Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>,
 Josselin Poiret <dev@HIDDEN>, 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 (-)

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

Message received at 70456 <at> debbugs.gnu.org:

Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 18:08:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 20 14:08:58 2024
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>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: bug#70456: Request for merging "core-updates" branch
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-Debbugs-Envelope-To: 70456
Cc: 70456 <at> debbugs.gnu.org, steve@HIDDEN
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-----
--=-=-=--

Message received at 70456 <at> debbugs.gnu.org:

Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 16:16:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 20 12:16:30 2024
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>
To: Christopher Baines <mail@HIDDEN>
Subject: Re: bug#70456: Request for merging "core-updates" branch
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-Debbugs-Envelope-To: 70456
Cc: 70456 <at> debbugs.gnu.org, steve@HIDDEN
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

Message received at 70456 <at> debbugs.gnu.org:

Received: (at 70456) by debbugs.gnu.org; 20 Apr 2024 11:14:56 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 20 07:14:56 2024
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>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: Status of =?utf-8?Q?=E2=80=98core-updates=E2=80=99?=
In-Reply-To: <87edbzri2p.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
 =?utf-8?Q?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-Debbugs-Envelope-To: 70456
Cc: Guix Devel <guix-devel@HIDDEN>, Josselin Poiret <dev@HIDDEN>,
 70456 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
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-----
--=-=-=--

Message received at 70456 <at> debbugs.gnu.org:

Received: (at 70456) by debbugs.gnu.org; 19 Apr 2024 17:00:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Apr 19 13:00:45 2024
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>
To: 70456 <at> debbugs.gnu.org
Subject: Re: bug#70456: Request for merging "core-updates" branch
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-Debbugs-Envelope-To: 70456
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, steve@HIDDEN
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-----
--=-=-=--

Message received at 70456 <at> debbugs.gnu.org:

Received: (at 70456) by debbugs.gnu.org; 19 Apr 2024 14:43:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Apr 19 10:43:21 2024
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>
To: 70456 <at> debbugs.gnu.org, steve@HIDDEN
Subject: Re: Request for merging "core-updates" branch
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-Debbugs-Envelope-To: 70456
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-----
--=-=-=--

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 18 Apr 2024 14:57:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Apr 18 10:57:24 2024
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>
To: bug-guix@HIDDEN
Subject: Request for merging core-updates branch
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-Debbugs-Envelope-To: submit
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