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 QLKVLA5X0V5IFwAA0tVLHw (envelope-from ) for ; Fri, 29 May 2020 18:40:14 +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 +JhLKA5X0V7RUgAAbx9fmQ (envelope-from ) for ; Fri, 29 May 2020 18:40:14 +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 456719400AF for ; Fri, 29 May 2020 18:40:14 +0000 (UTC) Received: from localhost ([::1]:47232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jejvR-00013x-6I for larch@yhetil.org; Fri, 29 May 2020 14:40:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jejvG-000121-JI for bug-guix@gnu.org; Fri, 29 May 2020 14:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jejvG-0001EY-8A for bug-guix@gnu.org; Fri, 29 May 2020 14:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jejvG-0003O4-4V for bug-guix@gnu.org; Fri, 29 May 2020 14:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41604: guix pull impossible after rebasing a local repository Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 29 May 2020 18:40: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: John Soo Received: via spool by 41604-submit@debbugs.gnu.org id=B41604.159077758612991 (code B ref 41604); Fri, 29 May 2020 18:40:02 +0000 Received: (at 41604) by debbugs.gnu.org; 29 May 2020 18:39:46 +0000 Received: from localhost ([127.0.0.1]:56232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jejux-0003NQ-3g for submit@debbugs.gnu.org; Fri, 29 May 2020 14:39:46 -0400 Received: from mail-qv1-f66.google.com ([209.85.219.66]:35603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jejuu-0003NA-M1 for 41604@debbugs.gnu.org; Fri, 29 May 2020 14:39:41 -0400 Received: by mail-qv1-f66.google.com with SMTP id j7so1553649qvp.2 for <41604@debbugs.gnu.org>; Fri, 29 May 2020 11:39:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=JJnjfATLbTe38Ks/bYS907s2Z7ejyUqWklIRhuuWrRU=; b=qjR7GjqmdhNEbPdG2vNQtu9QVn7y7+8b3NFxLXb/rZm8hL1fcAgDIv8cZHoT+OjwXf 0RVh5hMCD9t1vWhc+U4mbdsabujycnYZKzyCk6MX9FmfIsfJ9yOJn9jP1cqsR2Sj8TS2 vruZ27XJII8u6JPJ9DlOZg93iZ+vFKRs/8+gv0joz3UspSBYddSQhmCSjDeDa/nFutwg IwOsjBtziVhM0cBtQc9Gkl7fC0LHJ5rSoIyrrlW/SuzOVTBOo+QO3HrcA1gnqt3FruDj gpYKSrB53PrKveDOM1Edvk88XIEy4Ba7XhJ+ZRA2JL3mlyYEI7e1E1vDUxrZwsBNmPr+ UKSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=JJnjfATLbTe38Ks/bYS907s2Z7ejyUqWklIRhuuWrRU=; b=iEh02EXjZdMVhEFzekpimzdXksOhySjYRQDd0xRbL5+AFvrQn3dSCmZeIuBY5CXq0U gOVLNfz9UMx9DIars+6VafwNBlW9yWK7QHHUehu0L5KVFYioHT9yOzXiztiVwIzWGG4V 6xQfZTjvOCKAmrGHo5hH5plb2EfdKbIMmQHGdGYNkpHhLF85z6NIza7k7e2zFDX3xkQJ 0m0UyesGQ5NnvHcbLQ7Utg6llgklLY3a6FArBz9kHwyL3BprumpdGjvRNEuN1GSxJaOE Zw9ctkJsPC1FHmqCDiU/HxvJC9xcjZ6MgUN1bTSYcIwInthrRBbq9sEue217GqD/Tbwj nVtQ== X-Gm-Message-State: AOAM531OVg+/PA4x2w3yg9wpuTRVmzpIBDn9MeQDtk0ThgkrzRpWYJsn bKeBe0Sh19R9HORXAt6RRY8O7eDXbXLRq+d0nN9KbnhF X-Google-Smtp-Source: ABdhPJyCqgITYkAcurfEO52O3iTO/ESmQ2T401dxlnakXO2rBXYIG02LIIZ1sMQ9aeFce20CYeiExdaIGwZosT+kSRk= X-Received: by 2002:a05:6214:12ad:: with SMTP id w13mr8960404qvu.74.1590777575077; Fri, 29 May 2020 11:39:35 -0700 (PDT) MIME-Version: 1.0 References: <87zh9qofw7.fsf@asu.edu> <87r1v2oefd.fsf@asu.edu> <87k10uob2f.fsf@asu.edu> In-Reply-To: <87k10uob2f.fsf@asu.edu> From: zimoun Date: Fri, 29 May 2020 20:39:23 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" 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=gmail.com header.s=20161025 header.b=qjR7Gjqm; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: 2MfQqj0gPVpa On Fri, 29 May 2020 at 20:22, John Soo wrote: > Ah, I think that is the problem. I want to keep my same patches which > are rebased on top of origin/master. The patch contents are the same but > the commit hash has changed to something else. Hehe! Dangerous zone. :-) 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! :-) > > Otherwise, you could try: > > > > guix pull --rollback > > guix pull --commit=57518fc7 > > guix pull --allow-downgrades > > All of the following give the same error as reported: > > guix pull --commit=57518fc7bf1efc899c0dabaa76685a319661f8e4 > guix pull --commit=1444040933ac35b967720288dc30ed70e5481ed3 > guix pull --allow-downgrades --commit=57518fc7bf1efc899c0dabaa76685a319661f8e4 > guix pull --allow-downgrades --commit=1444040933ac35b967720288dc30ed70e5481ed3 > guix pull --allow-downgrades > > Using --rollback does not seem like an option 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. :-) Is "guix pull --commit=1444040933 --allow-downgrades" not working for you? Cheers, simon