From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id +GTpHYxGM2Z0VwAAqHPOHw:P1 (envelope-from ) for ; Thu, 02 May 2024 09:53:48 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id +GTpHYxGM2Z0VwAAqHPOHw (envelope-from ) for ; Thu, 02 May 2024 09:53:48 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gnu.org header.s=fencepost-gnu-org header.b="oB/9gvol"; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714636428; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=oc98J34okN06ritL+/7GMUdoEO2d93a71SMBabxs0DM=; b=ineL9v6tVOr5tl/NmnsAj+h6EQMUtcdnSXIPnpn7SBOVWJuDPN14sYdFhz1Hk+FwNfpq0Q pKNsn9UyalS5d0ZL7y4SV22JS5qbQzhiq4AD+6El6xr6MkbV9hvRQsliQv7khs7odZTH9U xC9ZIGzjA9LQy8t2zjCMV8S6OEl0sO0C+xlHu5LTpBrZCfiqfadRhAUbzBIuXmiZIiEzYY im/2VmJ0ZQWYs5qIP/JcVJEQp4Va0KGQhQvLwWWd0khuFjlPDXT09r7qrnjpp/yqDjYDNY m2w9/EVcacHyf0XAj8Hg8vcJVJFoYfTOb1SLC7DIOQ8MjUxGbVArhyBndGetlw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gnu.org header.s=fencepost-gnu-org header.b="oB/9gvol"; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714636428; a=rsa-sha256; cv=none; b=n/KJwOhxXPsyAIoukbsjxy6lHLHcZJ59d/p0Zu72tWyShacHASWMkXKLlXwHNrRWpPnn2k ym7Lg9KCHzN8OZ6SJk1XBS74jja37B2JpoYPwBw9VvucJ4JNC9SWYPGeLbah2+thH5MtBv OtxG4bpzRxwNeEsBGVvKwex99thzQ9wquPK5EI1D20wPMK/8SmDhwFRfGVH1No559of5mU P+CTTPH3WZYZrsQ6yDgFzfdl9siriU59tkxztuFlA53XETU26uBzxye2x2Zg4bb7emQ2hY PvPUx0BAEpOyDkBHfHRJlghpYJsPHtxkLnMulKQNl39a66ZD76FFtYBYthKGng== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3208B210D2 for ; Thu, 2 May 2024 09:53:48 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2RFp-0004ST-RL; Thu, 02 May 2024 03:53: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 ) id 1s2RFo-0004SJ-8N for guix-devel@gnu.org; Thu, 02 May 2024 03:53:20 -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 ) 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: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Cc: Guix Devel , Josselin Poiret , 70456@debbugs.gnu.org, Maxim Cournoyer Subject: Re: bug#70456: Request for merging "core-updates" branch In-Reply-To: <87mspo2sme.fsf@cbaines.net> (Christopher Baines's message of "Sat, 20 Apr 2024 12:14:33 +0100") References: <87edbzri2p.fsf@gnu.org> <87mspo2sme.fsf@cbaines.net> Date: Thu, 02 May 2024 09:53:14 +0200 Message-ID: <8734r03b11.fsf@inria.fr> 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-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -9.65 X-Migadu-Queue-Id: 3208B210D2 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -9.65 X-TUID: 1rxKBIUwGcH3 Hi Chris and all, Christopher Baines 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.