unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: zimoun <zimon.toutoune@gmail.com>
To: John Soo <jsoo1@asu.edu>
Cc: 41604@debbugs.gnu.org
Subject: bug#41604: guix pull impossible after rebasing a local repository
Date: Fri, 5 Jun 2020 03:44:47 +0200	[thread overview]
Message-ID: <CAJ3okZ2RuVqCRfUYUkQCwhx-6ZgX48fEgBsG3dO4XQ-iHjxL9A@mail.gmail.com> (raw)
In-Reply-To: <874krq2a5k.fsf@asu.edu>

Hi John,

On Thu, 4 Jun 2020 at 16:12, John Soo <jsoo1@asu.edu> wrote:

> 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!

Well, there is 2 issues, I guess.  One is fixed by allow downgrade.

The other one is not about '--allow-downgrades' but simply about pull
from a removed commit (rebase).  I do not think it could be considered
as a bug but the behaviour has changed and '--allow-downgrades' is not
enough.  Well, if I understand correctly what you described before in
this thread. :-)


> 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.

IMHO, the trick to be able to pull from a removed commit is to switch
generation first.  The price to pay is that history will be lost and
so news will be screwed up.

Well, for sure describe your workflow could be an entry of the Cookbook. :-)


All the best,
simon




  reply	other threads:[~2020-06-05  1:46 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-29 16:38 bug#41604: guix pull impossible after rebasing a local repository John Soo
     [not found] ` <handler.41604.B.159077032116756.ack@debbugs.gnu.org>
2020-05-29 16:41   ` bug#41604: Acknowledgement (guix pull impossible after rebasing a local repository) John Soo
2020-05-29 16:52 ` bug#41604: guix pull impossible after rebasing a local repository zimoun
2020-05-29 17:10   ` John Soo
2020-05-29 17:44     ` zimoun
2020-05-29 18:22       ` John Soo
2020-05-29 18:39         ` zimoun
2020-05-30  2:26           ` John Soo
2020-05-30 10:45             ` zimoun
2020-05-30 16:18             ` Arne Babenhauserheide
2020-05-31  5:04               ` John Soo
2020-06-01 16:48                 ` zimoun
2020-06-01 17:28                   ` John Soo
2020-06-01 16:35               ` zimoun
2020-06-03  9:28 ` Ludovic Courtès
2020-06-03 13:44   ` John Soo
2020-06-03 15:13     ` Ludovic Courtès
2020-06-04 14:11       ` John Soo
2020-06-05  1:44         ` zimoun [this message]
2020-06-05 16:13         ` Ludovic Courtès
2020-06-05  1:23       ` zimoun
2020-06-05 16:17         ` Ludovic Courtès
2020-06-05 17:51           ` zimoun
2020-06-07 21:16             ` Ludovic Courtès
2020-06-07 22:25               ` zimoun
2020-06-07 23:52                 ` John Soo
2020-06-10 14:51                 ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAJ3okZ2RuVqCRfUYUkQCwhx-6ZgX48fEgBsG3dO4XQ-iHjxL9A@mail.gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=41604@debbugs.gnu.org \
    --cc=jsoo1@asu.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).