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

[zimoun]

On Fri, 29 May 2020 at 20:22, John Soo <jsoo1@asu.edu> 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