From: Christopher Baines <mail@cbaines.net>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Josselin Poiret <dev@jpoiret.xyz>,
Guix Devel <guix-devel@gnu.org>,
70456@debbugs.gnu.org
Subject: Re: Status of ‘core-updates’
Date: Sat, 20 Apr 2024 12:14:33 +0100 [thread overview]
Message-ID: <87mspo2sme.fsf@cbaines.net> (raw)
In-Reply-To: <87edbzri2p.fsf@gnu.org> ("Ludovic Courtès"'s message of "Sun, 24 Mar 2024 12:21:34 +0100")
[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
> What’s the status of ‘core-updates’? What are the areas where help is
> needed?
>
> I know a lot has happened since the last update¹, which is roughly when
> I dropped the ball due to other commitments, but I’m not sure where 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=oneline 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=chris-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.
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
next prev parent reply other threads:[~2024-04-20 11:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-24 11:21 Status of ‘core-updates’ Ludovic Courtès
2024-03-30 10:55 ` Josselin Poiret
2024-04-10 14:39 ` Ludovic Courtès
2024-04-11 10:18 ` Steve George
2024-04-12 20:21 ` Ludovic Courtès
2024-04-17 17:47 ` Maxim Cournoyer
2024-04-17 22:52 ` Felix Lechner via Development of GNU Guix and the GNU System distribution.
2024-04-19 14:13 ` Ludovic Courtès
2024-04-19 15:22 ` Maxim Cournoyer
2024-04-22 16:20 ` Efraim Flashner
2024-04-20 11:14 ` Christopher Baines [this message]
2024-04-20 21:15 ` Maxim Cournoyer
2024-05-02 7:53 ` bug#70456: Request for merging "core-updates" branch Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mspo2sme.fsf@cbaines.net \
--to=mail@cbaines.net \
--cc=70456@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=guix-devel@gnu.org \
--cc=ludo@gnu.org \
--cc=maxim.cournoyer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).