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 S577K+Oj2V7oTQAA0tVLHw (envelope-from ) for ; Fri, 05 Jun 2020 01:46:11 +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 dxFmJ+Oj2V5EQAAAB5/wlQ (envelope-from ) for ; Fri, 05 Jun 2020 01:46:11 +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 DC2999402A0 for ; Fri, 5 Jun 2020 01:46:10 +0000 (UTC) Received: from localhost ([::1]:51670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jh1Qu-0003h0-Dn for larch@yhetil.org; Thu, 04 Jun 2020 21:46:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jh1Qo-0003go-3h for bug-guix@gnu.org; Thu, 04 Jun 2020 21:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jh1Qn-0003Q0-RU for bug-guix@gnu.org; Thu, 04 Jun 2020 21:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jh1Qn-0000zO-Of for bug-guix@gnu.org; Thu, 04 Jun 2020 21:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41604: guix pull impossible after rebasing a local repository Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 05 Jun 2020 01:46:01 +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: John Soo Received: via spool by 41604-submit@debbugs.gnu.org id=B41604.15913215063736 (code B ref 41604); Fri, 05 Jun 2020 01:46:01 +0000 Received: (at 41604) by debbugs.gnu.org; 5 Jun 2020 01:45:06 +0000 Received: from localhost ([127.0.0.1]:47909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jh1Pu-0000yC-HV for submit@debbugs.gnu.org; Thu, 04 Jun 2020 21:45:06 -0400 Received: from mail-qv1-f52.google.com ([209.85.219.52]:32830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jh1Ps-0000xJ-Fw for 41604@debbugs.gnu.org; Thu, 04 Jun 2020 21:45:05 -0400 Received: by mail-qv1-f52.google.com with SMTP id e20so3996363qvu.0 for <41604@debbugs.gnu.org>; Thu, 04 Jun 2020 18:45:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=3OVBc+FHxqaJMwam0bVx0l25lAU9alK9dZUSrlUW4J8=; b=ef/nSnQlD0sggjljeAOE6Fv7M7dii8Z/1LQ6lgiR4N84Mq/WtHUuwP0NGlP1JACgAZ VsLfpzwhipD+TAcnwfmX3vXDhf3JHgKy6t9mBqBopyZBUJSZGuyRx77fR5y8iS8YW+mx aMoHf8dWvFFd0snJQa7xKdr/bmjkg6lYZAzkm4dwDJcsyDeLJUgH71oAC/MvcDyq41BP OGjmJaF0mvn+pslSka2DSvwRA6dV/3SHdM9tZPoWtgVglQsOkAMdoqKZDqEhxE/olpvc rGFhCUFEVE0KezCL9+bp0IiQBjrlOvhvNZWl8xca6vJOAiBBQtv5xrK1xynoNDid5IFg 9qJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=3OVBc+FHxqaJMwam0bVx0l25lAU9alK9dZUSrlUW4J8=; b=nqi6l4tWFcRYOoH5ivnu79cQsdBMXY7xvgx+GgAcpjRdTs1CV8IBuumptAiBU03tnm cISuAiQ8cVcvWeq84HR4YSC3eyZFoXBK86ZG2RrzEUsHiIIR9GiBiPQHai+2OaRIzshX McYi35/quKbR1vMwUN2Zoj89u9Re//4q/ak+CXSpeM30XABZK8oPlmp775M4YSYWvr+c pQuPQfFZ1eyyi/0EuBf79Q1RppIuqqnCtZ4vqLKwVkxkT9vzwNVZzEc9I1r/7NTxUZlc B1VNNJqxWLGdinKlg3xpAY3b/iDXazu5eHa71Pzhn4V0MgwpdEKPVuZh/IksSFXbbGAf gY4w== X-Gm-Message-State: AOAM533URsbl4fxGbsiGhWxmmWghbCpZ58DveDsOM2IgcP2Aytdjm8sP uEMRDINE7hqHkR/+xYMFPGcCBTTPwnchja+PZAY= X-Google-Smtp-Source: ABdhPJypdruqagOkixmWzqSRtvpy/quQATVJ/iNF27/m09EHfpAutA4bBLAo0rPnGgyk3w+zs2rJPRytR/vcdHlCoQs= X-Received: by 2002:ad4:54aa:: with SMTP id r10mr7540249qvy.6.1591321498947; Thu, 04 Jun 2020 18:44:58 -0700 (PDT) MIME-Version: 1.0 References: <87zh9qofw7.fsf@asu.edu> <87a71kqyzw.fsf@gnu.org> <878sh41cx5.fsf@asu.edu> <87img8mbci.fsf@gnu.org> <874krq2a5k.fsf@asu.edu> In-Reply-To: <874krq2a5k.fsf@asu.edu> From: zimoun Date: Fri, 5 Jun 2020 03:44:47 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" 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=gmail.com header.s=20161025 header.b=ef/nSnQl; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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: y9H2e6jO75hR Hi John, On Thu, 4 Jun 2020 at 16:12, John Soo 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