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 OP7zCIPE0V5tYwAA0tVLHw (envelope-from ) for ; Sat, 30 May 2020 02:27:15 +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 SFNqBIPE0V5MEwAA1q6Kng (envelope-from ) for ; Sat, 30 May 2020 02:27:15 +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 4316E94050A for ; Sat, 30 May 2020 02:27:14 +0000 (UTC) Received: from localhost ([::1]:43190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jerDL-0005hC-BH for larch@yhetil.org; Fri, 29 May 2020 22:27:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jerDC-0005gq-Qt for bug-guix@gnu.org; Fri, 29 May 2020 22:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45042) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jerDC-0006ha-GW for bug-guix@gnu.org; Fri, 29 May 2020 22:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jerDC-0000Ck-Cg for bug-guix@gnu.org; Fri, 29 May 2020 22:27: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: Sat, 30 May 2020 02:27: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 Received: via spool by 41604-submit@debbugs.gnu.org id=B41604.1590805603762 (code B ref 41604); Sat, 30 May 2020 02:27:02 +0000 Received: (at 41604) by debbugs.gnu.org; 30 May 2020 02:26:43 +0000 Received: from localhost ([127.0.0.1]:56588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jerCt-0000CD-9a for submit@debbugs.gnu.org; Fri, 29 May 2020 22:26:43 -0400 Received: from mail-oi1-f171.google.com ([209.85.167.171]:43926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jerCr-0000C0-0L for 41604@debbugs.gnu.org; Fri, 29 May 2020 22:26:41 -0400 Received: by mail-oi1-f171.google.com with SMTP id i22so4364079oik.10 for <41604@debbugs.gnu.org>; Fri, 29 May 2020 19:26:40 -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=wQXIvns6KLTOCa0D6dNzQ+s0ncxJJXgnnNotQIKygG4=; b=hTTarktAimMxXGrG+fQQDVmlg9xFmXBBhLvhstHTCi6DOwFeuxUiIhFsSkqeyzAtmq I4LT7zuPDgI/l4HEau6u9ICUDpVcTypewm+rHSnSrltnIxYR2e6J/c0A+AcQqcJyUdoL jg0jD2zWuvegYFmsfpIJde7B4L1HisqG8iO3tuvq0LYpwJbUlfPJ3L32MSzyS5FeLvhf 27aLMs/oEIU/6IMT8+cJRefWfHn83FAkcvijtgxfaaA0jHvg6dex2dn9SVhkwBs3GHfP 6jM8X5HbUY8R4IVsPDiLgMvT3X5roNjZhnl2btmGzZoNmcTA0dQscinNV7jW3aUi4vS3 /gjw== 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=wQXIvns6KLTOCa0D6dNzQ+s0ncxJJXgnnNotQIKygG4=; b=EUv5yP7WvSy0jWRAjrk/KCND1S9usJWeQ9mAbYPCUUtTAtY4Guu7TnSA7u+/Bt+LhE rxhAJ8PdJJU4iEenbl8u59dsQ5s7zFtranlGcfNriJ0693iXoxq94vOGDJLwjKosWUM/ jRXNPkkDYmXfuymjDFz8lyscEKwiOTgSBMiUCOgGpWGoWgF3GByCqAAwVY8qoqBNmDUP CnWvzdfsbh/MRagziVt2/t70ienDX42PF6lE5rcxm8U6Vdns2WuesXGJp7LpYxxJ6UZ1 ovmjebIeTsiR+HVAbjc675QCAAOmxVm4F5m/WZ4FotTwWfF/qZoDA6d0T8QpxIVj36Rs F8YA== X-Gm-Message-State: AOAM532rkxCrNu2z9fSPRBFEKrq0R7LQpWWRrRhbhMOwoJ7LgdyBqESN Mr+BVbRx9nVWcWZ64wVeAoCC0YuWpFk1bg== X-Google-Smtp-Source: ABdhPJwtWU9ENWoeobnrInyAc+1ePNEizUbBDfb85PkkAppcKtCI0qM015kVDpiP4F6CQw8PS5F9uA== X-Received: by 2002:a05:6808:349:: with SMTP id j9mr7927206oie.74.1590805595002; Fri, 29 May 2020 19:26:35 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::479]) by smtp.gmail.com with ESMTPSA id w2sm1783779oon.36.2020.05.29.19.26.33 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 May 2020 19:26:33 -0700 (PDT) From: John Soo References: <87zh9qofw7.fsf@asu.edu> <87r1v2oefd.fsf@asu.edu> <87k10uob2f.fsf@asu.edu> Date: Fri, 29 May 2020 19:26:32 -0700 In-Reply-To: (zimoun's message of "Fri, 29 May 2020 20:39:23 +0200") Message-ID: <87ftbinoo7.fsf@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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=hTTarktA; 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: sPTVj6uyE6KQ Hello, zimoun writes: > Is "guix pull --commit=1444040933 --allow-downgrades" not working for you? Yeah guix pull --commit=1444040933 --allow-downgrades failed. > What do you mean? An option for you or an option of "guix pull"? > Ah my bad, it is "--roll-back". The double "--roll-back" and > "--rollback" options is only allowed with "guix package". Thank you > for the notification. :-) Ah, nice! roll-back helped me work around the problem. Very helpful, thanks! > Hehe! Dangerous zone. :-) I think I found that out, haha! > Personally, I keep clean ~/.config/guix/current by always pulling from > origin/master. > Then I have, as you, a local clone where I rebase, commit etc. But I > only pull to another profile than the default one, to avoid similar > situations as you currently are. ;-) > > /path/to/what-i-mean/bin/guix pull --url=/pah/local/clone > --branch=kikoo -p /path/to/next > > and I have some channels files under ~/.config/guix/ to simply some > regular, e.g., > > guix pull -C ~/.config/guix/extra.scm -p /path/to/extra > /tmp/extra/bin/guix install foo -p /tmp/test > > And so "guix pull" always works. > Anyway! :-) Nice! I like the idea of having a "next" profile. I guess that makes me wonder what the desired specification is. There is a lot of problem space to explore. As a user I would want to be able to take my local patches as "the real truth". Because guix has a linear git history, that means the user needs to always rebase. Often I have patches open for months that I am currently testing and working on. It would be convenient for me to be able to guix pull into my default user profile. On the other hand, as you point out, using a hash that disappears from the git history is dangerous. The git history no longer tracks the guix pull history and then there may exist pulls in history that may never be recoverable. There seems to be some existing support for the rebasing into the default profile since branches are allowed as references in the channels configuration. Has the rebase use case been discussed before? Oh, also, history items can be deleted in other places with --delete-generations and friends. I am not sure what to classify this problem, bug or something else. What do you think? - John