From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id eDKgFC4W7l5jOgAA0tVLHw (envelope-from ) for ; Sat, 20 Jun 2020 13:59:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MC98EC4W7l5bdAAA1q6Kng (envelope-from ) for ; Sat, 20 Jun 2020 13:59:10 +0000 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 BD6879401CF for ; Sat, 20 Jun 2020 13:59:09 +0000 (UTC) Received: from localhost ([::1]:33230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jme1U-00081g-Oy for larch@yhetil.org; Sat, 20 Jun 2020 09:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jme1O-00081T-7E for bug-guix@gnu.org; Sat, 20 Jun 2020 09:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jme1N-00074O-UW for bug-guix@gnu.org; Sat, 20 Jun 2020 09:59:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jme1N-0002MJ-TC; Sat, 20 Jun 2020 09:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41908: guix time-machine fails; XXXX is not related to introductory commit of channel 'guix' Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 20 Jun 2020 13:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41908 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Jan Nieuwenhuizen Received: via spool by 41908-submit@debbugs.gnu.org id=B41908.15926615349051 (code B ref 41908); Sat, 20 Jun 2020 13:59:01 +0000 Received: (at 41908) by debbugs.gnu.org; 20 Jun 2020 13:58:54 +0000 Received: from localhost ([127.0.0.1]:58598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jme1F-0002Lt-J7 for submit@debbugs.gnu.org; Sat, 20 Jun 2020 09:58:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jme1C-0002Lf-SY for 41908@debbugs.gnu.org; Sat, 20 Jun 2020 09:58:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39065) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jme17-0006yE-Gk; Sat, 20 Jun 2020 09:58:45 -0400 Received: from ti0006q161-3115.bb.online.no ([88.95.106.80]:57844 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jme16-0007Dt-9I; Sat, 20 Jun 2020 09:58:44 -0400 From: Marius Bakke In-Reply-To: <87366qeovy.fsf@gnu.org> References: <87blli11pi.fsf@gnu.org> <87366qeovy.fsf@gnu.org> Date: Sat, 20 Jun 2020 15:58:41 +0200 Message-ID: <87v9jldejy.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 41908@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -3.11 X-TUID: WJCPUDN6/C1+ --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi, > > (+Cc: Marius.) > > Jan Nieuwenhuizen skribis: > >> $ guix pull --commit=3D559491ea5b36b89b2a2f9d48dacf6a2d7e219910 >> Updating channel 'guix' from Git repository at 'https://git.savannah.gnu= .org/git/guix.git'... >> Building from this channel: >> guix https://git.savannah.gnu.org/git/guix.git 559491e >> [...] >> hint: Run `guix pull --news' to read all the news. >> >> 11:23:19 janneke@dundal:~/src/guix/master >> $ guix time-machine --commit=3D36640207c9543e48cd6daa92930f023f80065a5d = -- environment hello >> Updating channel 'guix' from Git repository at 'https://git.savannah.gnu= .org/git/guix.git'... >> guix time-machine: error: '36640207c9543e48cd6daa92930f023f80065a5d' is = not related to introductory commit of channel 'guix' >> >> [1]11:23:25 janneke@dundal:~/src/guix/master >> git log --pretty=3Doneline | grep 36640207c9543e48cd6daa92930f023f80065a= 5d >> 36640207c9543e48cd6daa92930f023f80065a5d quirks: Build 'compute-guix-der= ivation' modules with 2.2 when needed. > > I think =E2=80=98commit-relation=E2=80=99 is right: the two commits are u= nrelated. > > AIUI, commit 36640207c9543e48cd6daa92930f023f80065a5d was made on master > (May 29) after commit 9edb3f66fd807b096b48283debdcddccfea34bad (May > 26). Thus, they really existed in different branches, and they=E2=80=99re > unrelated. > > So we probably need to choose another introductory commit, one on > =E2=80=98master=E2=80=99, and that has to be the merge commit for =E2=80= =98staging=E2=80=99 > (8ab70bae52f8d4b6356ec3b8a88cebf9debe8520, June 13!). > > That sucks because that means that any branch forked before that is not > mergeable. That includes at least =E2=80=98core-updates=E2=80=99 (but th= ere are few > commits there, so it can be rebased, I think.) > > I don=E2=80=99t think we can relax the relation check with the introducto= ry > commit or we=E2=80=99d allow jumping anywhere. > > Thoughts? Uff, sorry for the incomplete 'staging' rebase. I did not realize that .guix-authorizations was missing completely in the earlier commits of that branch; I only focused on getting Brice's commit authorized. Yes core-updates needs to be rebased too because of this. And yes, not a lot of commits yet. So let's move the introductory commit and rebase core-updates on top, I can take care of the latter in a few days. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl7uFhEACgkQoqBt8qM6 VPosNAgAs6JdqrmP7XwNY00gfm7lcxRym78lZfIRePmhmTXiB4RTSmWU5DcwvFex AZHZbvk15SnpJtMDosorZeZ/uVbmUlGx1WLimDVDUu24Ezc1Mls4yfUVrUeNnDPi LEr3oRB09lSY1PYJOiKLG2HiEXZekY8h9/Y8gg0ymfeHmSo09t1l6SkW+e4bLlHo AAnS+dbsasPYRNh9lDe2eEjQwM+QOi3KvaGc4XYzMLMNMM+Uff41bbguoFC1pLXK PlxRmDYunzUwPvSJ7xfcluHdx/WQ6+fRsfD9n6H3BisMDZuanEMPSAFry/+UQNNz Ch3vBLJr7F+slb29BNnMw9gEfmMZxA== =UxPD -----END PGP SIGNATURE----- --=-=-=--