bug-guix
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: John Soo
Subject: bug#41604: guix pull impossible after rebasing a local repository
Date: Thu, 04 Jun 2020 07:11:35 -0700
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)

Hi Ludo,

Ludovic Courtès <ludo@gnu.org> writes:

> It supports unrelated Git histories.  It could really be called
> ‘--allow-anything’ but I thought it’d be less descriptive.  :-)
>
> If you hit a problem with that, please report it (perhaps I just
> overlooked it in the other issue.)

Oh nice, then this whole issue I think should be to report that
--allow-downgrades does not allow everything.  When I first reported the
issue I tried --allow-downgrades thanks to some help on IRC.  The first
attempt failed as I mentioned previously in the thread.  However I did
just try --allow-downgrades again after a rebase and it seems to have
succeeded.  With that, I think this issue can be closed.  Thanks for
thinking of this case!

> Interesting, I hadn’t thought about how this mechanism would give an
> incentive to have a channel vs. contributing directly upstream.

I think I will add some notes about a rebase workflow and
--allow-downgrades to the contributing documentation. Looking just now
I'm not sure using a local source tree as a channel is mentioned in the
documentation either. I will open a different patch set to deal with
those issues.

> Normally, ‘--allow-downgrades’ does exactly what you need, at least
> that’s the intent.  I’d argue that it’s also reasonable to use it in
> this case because obviously you know what you’re doing, and you’re
> pulling from a local Git repository, so that’s fine.

100% it does what I need.

Thanks again, feel free to close.

- John





reply via email to

[Prev in Thread] Current Thread [Next in Thread]