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 uP36HOk61V7xVgAA0tVLHw (envelope-from ) for ; Mon, 01 Jun 2020 17:29:13 +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 KGeyGOk61V5zIgAAbx9fmQ (envelope-from ) for ; Mon, 01 Jun 2020 17:29:13 +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 95B669404C8 for ; Mon, 1 Jun 2020 17:29:12 +0000 (UTC) Received: from localhost ([::1]:57998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfoFJ-0002Z6-Vn for larch@yhetil.org; Mon, 01 Jun 2020 13:29:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfoFC-0002Yr-F1 for bug-guix@gnu.org; Mon, 01 Jun 2020 13:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfoFC-0000zO-5F for bug-guix@gnu.org; Mon, 01 Jun 2020 13:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfoFC-0002aG-2L for bug-guix@gnu.org; Mon, 01 Jun 2020 13:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41604: guix pull impossible after rebasing a local repository Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 01 Jun 2020 17:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41604 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: zimoun X-Debbugs-Original-Cc: Arne Babenhauserheide , bug-guix@gnu.org, 41604@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15910325099876 (code B ref -1); Mon, 01 Jun 2020 17:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Jun 2020 17:28:29 +0000 Received: from localhost ([127.0.0.1]:36935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfoEf-0002Z9-0L for submit@debbugs.gnu.org; Mon, 01 Jun 2020 13:28:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:59840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfoEd-0002Z2-SX for submit@debbugs.gnu.org; Mon, 01 Jun 2020 13:28:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfoEd-0002KU-MO for bug-guix@gnu.org; Mon, 01 Jun 2020 13:28:27 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:43103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfoEc-0000xy-1S for bug-guix@gnu.org; Mon, 01 Jun 2020 13:28:27 -0400 Received: by mail-pg1-x542.google.com with SMTP id 185so3806528pgb.10 for ; Mon, 01 Jun 2020 10:28:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=Wi/h/c8qwIArqnopJ7WIEbjscGOk/x8OPwmdWte+dIM=; b=eAPInP3R4jL0ZFEAYzCokk3to6ov/GhWhn/z9DWVOV5R8NEtrO52mSbopKJaX0cXRA 1DQK3jo8PG1hw+GOHg2vFfm/VLGRAp/VoQ2JfQL8R3N+c49H3c9eZzjcveGDlMHexjj7 oCY8SeZPWEz4qp0e2g6qK1t7yb9iKiTqdMYWHml74Yeg4puUA22EXuuV+HyzKuxF0hoq qW62/zrxXn0wQsK9FSeqoYPpHBBZQHrvGm4EHwOXZGt9W47GtOORArQ9fwZyplxd89kq e5yQGq/O8P4Jov3fu8yzICgPAX7nqNZ2HKF7+N8ZLgUqqISVDb8Rv9LrV2KYRatVUPbR N+YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=Wi/h/c8qwIArqnopJ7WIEbjscGOk/x8OPwmdWte+dIM=; b=c+r1CSVbTB9MNeiL6ot3cqV0tW22gHETSFfaZfPGkJpoZxzO8re3Sko4TjrGgOcd1X 0g0AXcBdJkeUOPPtvoObEdDDQ8Ww7e20KaGDEzT+5FOCkiROuxYS4vxvvFrrDm3BXONi dk7rCHychvkxrKwQcMljszksjcJTdvZ+3FSNPV4k6eEr94HNwvBI9c/eyTjqVa2BJdsq 0JRAN/KH6+yAvpnQg2wV8Z2eglVtHtdnlDD4DKKBLHiQh7mRHkRxqgOqkHbu9eNqpqDK 9qPTruVh2Lx8mbVwwP2knvM2R9Lnp5J2ThgEo0MagONZh16jL84OVBmxHnx9OKyK1P1i FWFQ== X-Gm-Message-State: AOAM533NDDT3tZfxls2Hfrk96B7deN4MmQbdqH93z7tHcFSbGiqT98yc BiQwYnnQNWdkYmrloTg5DlNzIpARiUGCGA== X-Google-Smtp-Source: ABdhPJzptoCbSmb3LDrTQrJgh2jb1oskMg2xfH82onvsoo1FZmuh+QnPCexjIJl7SC9vzeWebBaxcw== X-Received: by 2002:a62:248:: with SMTP id 69mr21855416pfc.243.1591032502821; Mon, 01 Jun 2020 10:28:22 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::7bb]) by smtp.gmail.com with ESMTPSA id r31sm80927pjg.2.2020.06.01.10.28.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Jun 2020 10:28:22 -0700 (PDT) From: John Soo References: <87tuzxgzw2.fsf@web.de> <1D37F750-2DA3-4DF1-91A5-92637E58E753@asu.edu> Date: Mon, 01 Jun 2020 10:28:21 -0700 In-Reply-To: (zimoun's message of "Mon, 1 Jun 2020 18:48:30 +0200") Message-ID: <87wo4q1yru.fsf@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::542; envelope-from=jsoo1@asu.edu; helo=mail-pg1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.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: 41604@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=fail (rsa verify failed) header.d=asu-edu.20150623.gappssmtp.com header.s=20150623 header.b=eAPInP3R; dmarc=fail reason="SPF not aligned (relaxed)" header.from=asu.edu (policy=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: 0.09 X-TUID: xd42siP7xbhw Hello again, zimoun writes: > On Sun, 31 May 2020 at 07:04, John Soo wrote: > >> My problem largely comes from the fact that I specified a branch in >> channels.scm for over a year with the same workflow. If a branch can >> be specified for a channel repo then the system probably should >> handle the current pull commit not being available in the history. > > What do you mean? Well if a channel specification has a branch then the channel specification explicitly allows the commit history to not always have the commit from "guix describe". For example, say the channels.scm file has the following: (list (channel (name 'example-channel) (url "https://git.example.com/repo") (branch "example-branch")) ...) the maintainer of example-channel may rebase example-branch on some other branch. Then guix-pull will indeed be impossible for anyone who has example-channel specified with the branch field in channels.scm. So what I am saying is that if unrelated histories are to be disallowed during "guix pull" then branches should not be allowed in channel specifications. >> The commit history authentication is nice but seems to have >> regressed this particular use case. > > I am not sure that the new history authentication is the issue here. > IMHO, it is just the feature that shows up the flaw with your > workflow. ;-) You are right, I should not assume what introduced my problem. What I do know is that this workflow worked for the last year or more until last week. I should do a bisect to find the exact commit. >>>From my understanding, Guix is built around content-addressed > principles (channel, store, etc.) so try to change on the fly the > address of such content would lead to break one way or another, IMHO. > > > Well, is the issue fixed for you now? The issue is not fixed and I think I found another problem with the workaround. To reiterate, my workaround is to "guix pull --roll-back" until a generation that has a the commit that is in my history then "guix pull" again to get my new work. The problem is the next "guix pull" shows all news from the old commit until the newest commit. In other words I get the news I saw from the previous time I pulled plus any new work. In this way the news continues to accumulate making the news less and less useful and more and more noisy. Btw, I am totally with you on pijul/darcs or some patch theory version control. Pijul does indeed look pretty promising. I packaged it in my channel if you want to try it :). Kindly, John