From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sO52A88r7V6ydQAA0tVLHw (envelope-from ) for ; Fri, 19 Jun 2020 21:19:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4ADzOs4r7V6OKQAAbx9fmQ (envelope-from ) for ; Fri, 19 Jun 2020 21:19: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 712DD9404C8 for ; Fri, 19 Jun 2020 21:19:10 +0000 (UTC) Received: from localhost ([::1]:34362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmOPl-0004U2-Bv for larch@yhetil.org; Fri, 19 Jun 2020 17:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmOPe-0004Tq-Ap for bug-guix@gnu.org; Fri, 19 Jun 2020 17:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmOPd-00058F-Sr for bug-guix@gnu.org; Fri, 19 Jun 2020 17:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmOPd-0005MO-On for bug-guix@gnu.org; Fri, 19 Jun 2020 17:19: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 19 Jun 2020 21:19: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: Jan Nieuwenhuizen Received: via spool by 41908-submit@debbugs.gnu.org id=B41908.159260148420520 (code B ref 41908); Fri, 19 Jun 2020 21:19:01 +0000 Received: (at 41908) by debbugs.gnu.org; 19 Jun 2020 21:18:04 +0000 Received: from localhost ([127.0.0.1]:56949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmOOi-0005Ku-8a for submit@debbugs.gnu.org; Fri, 19 Jun 2020 17:18:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmOOg-0005KQ-74 for 41908@debbugs.gnu.org; Fri, 19 Jun 2020 17:18:03 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57526) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmOOa-00050s-VI; Fri, 19 Jun 2020 17:17:56 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39344 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jmOOZ-0001lA-PI; Fri, 19 Jun 2020 17:17:56 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87blli11pi.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 2 Messidor an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 19 Jun 2020 23:17:53 +0200 In-Reply-To: <87blli11pi.fsf@gnu.org> (Jan Nieuwenhuizen's message of "Wed, 17 Jun 2020 11:27:53 +0200") Message-ID: <87366qeovy.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: -1.01 X-TUID: liqg6CDWLb0u 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 n= ot related to introductory commit of channel 'guix' > > [1]11:23:25 janneke@dundal:~/src/guix/master > git log --pretty=3Doneline | grep 36640207c9543e48cd6daa92930f023f80065a5d > 36640207c9543e48cd6daa92930f023f80065a5d quirks: Build 'compute-guix-deri= vation' modules with 2.2 when needed. I think =E2=80=98commit-relation=E2=80=99 is right: the two commits are unr= elated. 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=98= staging=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 ther= e 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 introductory commit or we=E2=80=99d allow jumping anywhere. Thoughts? Ludo=E2=80=99.