From: "Ludovic Courtès" <ludo@gnu.org>
To: Christopher Baines <mail@cbaines.net>
Cc: Guix Devel <guix-devel@gnu.org>,
Josselin Poiret <dev@jpoiret.xyz>,
70456@debbugs.gnu.org,
Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: Re: bug#70456: Request for merging "core-updates" branch
Date: Thu, 02 May 2024 09:53:14 +0200 [thread overview]
Message-ID: <8734r03b11.fsf@inria.fr> (raw)
In-Reply-To: <87mspo2sme.fsf@cbaines.net> (Christopher Baines's message of "Sat, 20 Apr 2024 12:14:33 +0100")
Hi Chris and all,
Christopher Baines <mail@cbaines.net> 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=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.
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’ve explained, it seems to me it’s worth 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-gnutls-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 "0fj7gxc7rlzzrafnx9nmf7ws3paxy583fmx7bcbavi6gr3xmy881")))) (arguments (list #:tests? #f #:configure-flags (gexp (append (quote ("--disable-wayland-shared" "--enable-video-kmsdrm" "--disable-kmsdrm-shared")) (quote ("--disable-alsa-shared" "--disable-pulseaudio-shared" "--disable-x11-shared" "LDFLAGS=-lGL")))) #:make-flags (gexp (cons* (string-append "LDFLAGS=-Wl,-rpath," (ungexp (this-package-input "eudev")) "/lib" ",-rpath," (ungexp (this-package-input "vulkan-loader")) "/lib") (quote ("V=1")))))) (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"))) (synopsis "Cross platform game development library") (description "Simple DirectMedia 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’t correctly resolved.
This branch rewrites the entire ‘core-updates’ history. What about
rewriting starting from the first series of “duplicate” commits? That
should solve the immediate issue while keeping the “known good” history?
Thanks,
Ludo’.
prev parent reply other threads:[~2024-05-02 7:53 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
2024-04-20 21:15 ` Maxim Cournoyer
2024-05-02 7:53 ` Ludovic Courtès [this message]
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=8734r03b11.fsf@inria.fr \
--to=ludo@gnu.org \
--cc=70456@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=guix-devel@gnu.org \
--cc=mail@cbaines.net \
--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).