From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YLFCARSzeGT4zAAASxT56A (envelope-from ) for ; Thu, 01 Jun 2023 17:02:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kJFGARSzeGSCNAAA9RJhRA (envelope-from ) for ; Thu, 01 Jun 2023 17:02:44 +0200 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 B4989C407 for ; Thu, 1 Jun 2023 17:02:42 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4joj-0005l6-Ni; Thu, 01 Jun 2023 11:02:22 -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 1q4joR-0005gd-V7 for bug-guix@gnu.org; Thu, 01 Jun 2023 11:02:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4joQ-0006zZ-Gs for bug-guix@gnu.org; Thu, 01 Jun 2023 11:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q4joQ-0007Vc-0x for bug-guix@gnu.org; Thu, 01 Jun 2023 11:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63726: time-machine without options does not get the latest commit Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 01 Jun 2023 15:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63726 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Simon Tournier , Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63726@debbugs.gnu.org Received: via spool by 63726-submit@debbugs.gnu.org id=B63726.168563171528852 (code B ref 63726); Thu, 01 Jun 2023 15:02:01 +0000 Received: (at 63726) by debbugs.gnu.org; 1 Jun 2023 15:01:55 +0000 Received: from localhost ([127.0.0.1]:38332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4joI-0007VH-IN for submit@debbugs.gnu.org; Thu, 01 Jun 2023 11:01:54 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:34923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4joF-0007Uy-0U for 63726@debbugs.gnu.org; Thu, 01 Jun 2023 11:01:54 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 37FB85C014F; Thu, 1 Jun 2023 11:01:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 01 Jun 2023 11:01:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= cc:cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1685631705; x=1685718105; bh=2R 3kwM/Hbumu1eE+kQ99r4v1LjG63K/Mw4etsolnAC8=; b=L+hxoVEPDzvUVr2DyJ y+MYW53mHNdCMEdX6hVhBmVlEJt3vzA9o/NGQw3UxcLVgzx5VPg3mMyScXwPV9kI a87QGlKvfLXkUd3kdqf0U6COI/zA3zXHb9E+Kb3q94RrXbQxieB9gkDfsGqMhWVk HHuDlf6ccouQtkSVyqo81EXouWH8SaGHn+xdhIWJMJuf0QXIHFwTIyqCiCxch90b 19VImoda5xdeMeI1HvuzvZ30+DnCVj1X0hB2lXSDr613mdVKk+1DvTvQhSN+FC56 X3u8+ffIt5kRIUhg3UR3ICMvwKnVlq0eTOqhLEqaL04bcE7idZvzlfzskjvu9neM GIeQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1685631705; x=1685718105; bh=2R3kwM/Hbumu1 eE+kQ99r4v1LjG63K/Mw4etsolnAC8=; b=SiTJ/YtOqgGW0nlB/jeWWCjiaJNg3 fL5VI+QZzWMP2V+a11Eg5n2mEjItpFtJtI4OIuFe5MBVT6tfH/T83y9HH+eMqPbA fWwi61DB02bhf5yJ9IKX6HWnIq+YI4y++a/6BgkvfyHKtWXh6VOCFAkRu+um3yV4 m8m31gqpGjliHwd+/qU2kHDYNjSrlx0gTTz2EJrJS50YBGR6drQH2jKMeVqY9W+l s5/L8UkZ/w/mpmEwl9Ij5QagyqwYtanJMaZeMh6TjavC736szsFmH/KhB9Ux7KTt pxjLh8vYONvB1712cKG/EWF8ze9ikrOBNY1H3JVNkYfEWoTz5m60EXrog== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeeluddgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefujghffffkgggtsehmtderredttddtnecuhfhrohhmpefmohhnrhgr ugcujfhinhhsvghnuceokhhonhhrrggurdhhihhnshgvnhesfhgrshhtmhgrihhlrdhnvg htqeenucggtffrrghtthgvrhhnpedvhfelveelffetheeuhedvffduhedtgfeuueejudel hfehfeelueeuffeilefgleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehkohhnrhgrugdrhhhinhhsvghnsehfrghsthhmrghilhdrnhgvth X-ME-Proxy: Feedback-ID: i184641e2:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 1 Jun 2023 11:01:42 -0400 (EDT) From: Konrad Hinsen In-Reply-To: <87r0qyrlm0.fsf@gmail.com> References: <87v8ggwmat.fsf@gmail.com> <875y8gcedh.fsf@gnu.org> <87r0qyrlm0.fsf@gmail.com> Date: Thu, 01 Jun 2023 17:01:40 +0200 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685631763; 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:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=2R3kwM/Hbumu1eE+kQ99r4v1LjG63K/Mw4etsolnAC8=; b=SHifKBzF3pYsxqpoJVM1GeXolR15rCOn9aEkI2y4p55x9tjuX1LW9vWzxyXP54dTxC6WOM eg5/dAUreSGggGcJu+8U/yFM+1lZxo3v25kyUaYiugjDHAh9VprJmPpgemAEp5GPZCsKXG yJ3lZxxnDN+6+4QHw48BWYcOVcw3KwJDt+ExkLBHMIcQu0XrqVKs0EiEuUzStLqwqPkZs1 NpA5ZrUmu0LgbVSAoaMhQ4DqwsNl1X2cL3LDDu+qb76SrBK9K12T35kqyk4/UPv1uOkNf2 SBXE3YDIXuvYuuPkSpawvPAsj/2wLXSFQgkfdA+Ia6FDNcju/azzmDSrkxCrBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fastmail.net header.s=fm1 header.b=L+hxoVEP; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="SiTJ/YtO"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685631763; a=rsa-sha256; cv=none; b=ZTpYsAZ5SzY7ujKPPI7KkaKFUr4dLWgrsRF8DBcBqXGL3n7Vqy65PwgnizEY/WX5Ru3w7Q aQLJ4ehupXIjh7GSfOoXpC+hmv/B2Ky2OvRoKseqc6o1x2phpgfuzypu4nUc8J8yWlv1fj nad5VU5zzOnqETH7jaqk2FMdEQnkYhDWFDxCopCF9OUYm8RGfXjOvatXCsQFg7wJqYOsDp ++PX3ryynuDJcmTQTp9QyGvo+rG376lbzQU0hyCBxMLX+78D+Lb+pV/dbNzx5Iu0Y7Ict6 yZKRuoWjvVwXioUApDr5zKnOFWRPKT97M+c6ERlmAmzpBWUUGDcxv6jDt1NoDQ== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fastmail.net header.s=fm1 header.b=L+hxoVEP; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="SiTJ/YtO"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B4989C407 X-Spam-Score: -2.16 X-TUID: gJNwiMKfqoLG --=-=-= Content-Type: text/plain Hi Simon, > What about this patch? That's a good start! But I didn't quite understand what "as defined by the previous +@dfn{channels} file" means, so I did some more research and some more rewriting, and came up with the attached patch. That one is clear for me, but maybe not for others... In the course of this research, I noticed that channel files are used in Guix in two varieties for rather different purposes, but this doesn't seem to be explained anywhere. "guix describe -f channels" produces channel files with a pinned commit for each repository. That's what we usually give to time-machine. That feature of channel files seems even undocumented. The chapter on channels discusses the channel files we typically use with "guix pull", and which refer to a branch and thus its last commit, rather than to a pinned commit. Cheers, Konrad. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-doc-Reword-guix-time-machine-without-option.patch >From cbe372191a2daea7b62d8558422f08bc6ed0e047 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Thu, 1 Jun 2023 16:55:33 +0200 Subject: [PATCH] doc: Reword guix time-machine without option. * doc/guix.texi (Invoking guix time-machine): Reword the behaviour in the absence of any option. --- doc/guix.texi | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7f8d8d66e9..e4daffe4dd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4959,16 +4959,25 @@ Invoking guix time-machine @xref{Channels} for more information. @end table -As for @command{guix pull}, the absence of any options means that the -latest commit on the master branch will be used. The command +In the absence of any options, the target revision will be determined as +for @command{guix pull}, i.e. from the user's +@file{~/.config/guix/channels.scm} file, or, if no such file exists, +from the system-wide @file{/etc/guix/channels.scm} file, or, if that +file does not exist either, from the built-in default channels specified +in the @code{%default-channels} variable. Note that these three +fallbacks are usually channel definitions pointing to @i{branches} in +git repositories, rather then to specific @i{commits}, as the channel +definitions produced by @command{guix describe} do. A branch-based +channel definition refers to the latest commit on that branch. The +command @example guix time-machine -- build hello @end example -will thus build the package @code{hello} as defined in the master branch, -which is in general a newer revision of Guix than you have installed. -Time travel works in both directions! +will thus build the package @code{hello} as defined by the current state +of the default channels. In general, it builds a @i{newer} revision of +Guix than you have installed. Time travel works in both directions! Note that @command{guix time-machine} can trigger builds of channels and their dependencies, and these are controlled by the standard build -- 2.40.1 --=-=-=--