From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QNEhOxVT0V55LAAA0tVLHw (envelope-from ) for ; Fri, 29 May 2020 18:23:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8If7NhVT0V4oUgAAB5/wlQ (envelope-from ) for ; Fri, 29 May 2020 18:23:17 +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 4CCDD940981 for ; Fri, 29 May 2020 18:23:17 +0000 (UTC) Received: from localhost ([::1]:37232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jejf0-000178-QK for larch@yhetil.org; Fri, 29 May 2020 14:23:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jejeo-000157-Nu for bug-guix@gnu.org; Fri, 29 May 2020 14:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jejeo-0002Wp-Bg for bug-guix@gnu.org; Fri, 29 May 2020 14:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jejeo-0002wx-7K for bug-guix@gnu.org; Fri, 29 May 2020 14:23: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: Fri, 29 May 2020 18:23: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.159077658011318 (code B ref 41604); Fri, 29 May 2020 18:23:02 +0000 Received: (at 41604) by debbugs.gnu.org; 29 May 2020 18:23:00 +0000 Received: from localhost ([127.0.0.1]:56203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jejel-0002wU-U4 for submit@debbugs.gnu.org; Fri, 29 May 2020 14:23:00 -0400 Received: from mail-oi1-f195.google.com ([209.85.167.195]:39773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jejek-0002wH-Jm for 41604@debbugs.gnu.org; Fri, 29 May 2020 14:22:59 -0400 Received: by mail-oi1-f195.google.com with SMTP id a7so3061442oic.6 for <41604@debbugs.gnu.org>; Fri, 29 May 2020 11:22:58 -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=c9nxNNbEcVDBoPy2b4kUl1akxPOWmHxa9teCmrbW/wg=; b=HS+59/VQW4fIoTRtHjl7RxL97AdekErl1OVtPV5+Qofr5XDeR3gpvZtV5j2RfN5EJt Pf5f+ohiY7rs3wYOEhtmdvOaFk3isnURgQ17IAB7p8cYReMLLsCvflZiYARunO/GT4QO TnytuCfYFfw+kznFidRpXIY6e/lRuLZwDiapEYEehRGUCPwhBH7Bjlmio3tK+4mH7Lif hKBawgvT2Wie32QRulKz/9JdhDn1XL3XjMibecYSdybL5hqaonuJe+iI6c4J67yvBa6r 5HkHnZ7Wo4nGUOnYYXIQHzTUTpcZ8jGcN/+GhFD7teLeiOj8AZV0hxSdI6o+fnsOj8W0 JRow== 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=c9nxNNbEcVDBoPy2b4kUl1akxPOWmHxa9teCmrbW/wg=; b=qim59YyOZEJPpfGcZDfTDq5gV6t6eNsyfCKBEkTHJc35uTGbHLbBMYgDhcjDyaIs+h +iMBYKfUN2HDoxrcQPhaiaf0BUmfBfC6nmq2mrTgFA6SCIe1C+YoglTg4etl3vRqTr5z Xd2E4ExPSqSAUegXoYqrMV5a5fNm2Rt4UIWvzArgqZWQ0gMu2VJ1G2n+p5gV1TG7phwE z9tCZ7XOVp7kEkYx7vSsupusUWsaBreVH5I1RdkRGehXOGGnwcWkXG1F4PNevQhoPRiU 0OniMxsrq6v6W/bcyyVex6Hn4wLu+xChvKLXS+FSIVuaKzdJvayyKCO/shyiYQNT35tN WHXg== X-Gm-Message-State: AOAM531fMGtyxupfHujuxhKCsdk19OdzVfDsi5EGwDLf1TEuwRbOLjF0 XGj+nUjNqLM5kQjFgn0K1u1qIzXrhIHWVw== X-Google-Smtp-Source: ABdhPJwVWAANfrLW3I8HiTeF4aG5wz8tudnX3unqPkhVuFqbNTkZFmwpiPWYi9iNaXHYI0AbZRzhcw== X-Received: by 2002:a05:6808:3c7:: with SMTP id o7mr6673973oie.124.1590776570660; Fri, 29 May 2020 11:22:50 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::479]) by smtp.gmail.com with ESMTPSA id a64sm810466oib.43.2020.05.29.11.22.49 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 May 2020 11:22:50 -0700 (PDT) From: John Soo References: <87zh9qofw7.fsf@asu.edu> <87r1v2oefd.fsf@asu.edu> Date: Fri, 29 May 2020 11:22:48 -0700 In-Reply-To: (zimoun's message of "Fri, 29 May 2020 19:44:03 +0200") Message-ID: <87k10uob2f.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=HS+59/VQ; 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: qXWRd6HlzASq Hello, zimoun writes: > Maybe, you can try: > > guix pull --commit=57518fc7bf1efc899c0dabaa76685a319661f8e4 > --allow-downgrades > if 57518fc7 is really in your channel at ~/john/projects/guix/.git -- > I mean, you have replaced 'https://' by a local clone where you are > committing stuff, right? 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. $ git rev-parse HEAD 1444040933ac35b967720288dc30ed70e5481ed3 Commit 57518fc7bf1efc899c0dabaa76685a319661f8e4 no longer exists in my branch's history: $ git log --oneline --grep='57518' (nothing) I specify the branch in channels.scm: (list (channel (name 'guix) (url "file:///home/john/projects/guix/.git") (branch "my-master")) (channel (name 'private) (url "file:///home/john/projects/guix-channel/.git") (branch "master"))) > 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 $ guix pull --rollback guix pull: error: rollback: unrecognized option > Well, I do not know if it helps... Definitely! I am getting more familiar with the pull options. Thank you! - John