From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 8NSMNcCjI2a53wAA62LTzQ:P1 (envelope-from ) for ; Sat, 20 Apr 2024 13:15:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 8NSMNcCjI2a53wAA62LTzQ (envelope-from ) for ; Sat, 20 Apr 2024 13:15:13 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713611712; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=699uamKvpxdLnPGxSHdflkOYFPfrHyZ4A7zEuMnnuVI=; b=tRbgN3NfYbfJnAbBQEYZoxKoPCtKCv0zssXa3qdhIxDiqU707/AKvm5znyKdwHd2Wmg35s 75ArKkeBokMmzG40N7L/61Z/j/JIpWUVr0p+5kns1q3g5LblfSCSDhNe7B0gynciHhN/7V +GUWStNqzLPeoGKI8gOS124OisZBpFZlzQG0IwpDt3xr7pWzvN/wPTPejLXCmRUR/8WFfH UwD0E90HmIXE58aqayyQAcvpvQDEtbVrZM6YRuxWEpJBmD/F2xJr+ijnQTOfbGLX+bZV4H BKDh2gbsYzckvUlsEVOEhD6E0OVorEwTfBgUIVki9Yj/tJMFw/wruwm9+v6j6A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713611712; a=rsa-sha256; cv=none; b=qgXV1ATyCz6f+/nPZ3kcr/dql/2/kuPZHm8agzCBWKpkj/V9Ust7Br5LvdUO6u3blCsO21 4XfbuN9ln8mA2UITnBsjOu7AXbKnuxEsCTH2wVkg3zXxMvim04sznzMhefb7E7xyBDdPZO CqRD44+TFVMQvzNyRh8lLoM1+S5eAmf+VXDSysTwCz/tswTUMqcPiY9eaUyRra9lcB11WR QStGy+tMh7gdoKqWPIk2jUXPY1ccp77Eszz+r8m8DIYxQUY+T67jBpVSomr1eNr27o+6GD kqHjOu6nGVpIinguU/HWitMGu1eNaJ2Wmfqs31EBDgMo5mIk6svD20Ju8B5/2A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=none 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 B861D370FD for ; Sat, 20 Apr 2024 13:15:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ry8g8-0006BF-Og; Sat, 20 Apr 2024 07:14:44 -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 1ry8g7-0006Aq-1N for guix-devel@gnu.org; Sat, 20 Apr 2024 07:14:43 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ry8g5-00089m-4K; Sat, 20 Apr 2024 07:14:42 -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 To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: Maxim Cournoyer , Josselin Poiret , Guix Devel , 70456@debbugs.gnu.org Subject: Re: Status of =?utf-8?Q?=E2=80=98core-updates=E2=80=99?= In-Reply-To: <87edbzri2p.fsf@gnu.org> ("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@gnu.org> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Sat, 20 Apr 2024 12:14:33 +0100 Message-ID: <87mspo2sme.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.48 X-Spam-Score: -5.48 X-Migadu-Queue-Id: B861D370FD X-Migadu-Scanner: mx12.migadu.com X-TUID: gv1CF3NI1qZw --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s 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----- --=-=-=--