bug#41604: guix pull impossible after rebasing a local repository

[John Soo]

Hello,

zimoun <zimon.toutoune@gmail.com> 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