From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QuKcETsB2V78BAAA0tVLHw (envelope-from ) for ; Thu, 04 Jun 2020 14:12: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 mp1 with LMTPS id 4HrPDDsB2V5BWwAAbx9fmQ (envelope-from ) for ; Thu, 04 Jun 2020 14:12: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 C077A9402D6 for ; Thu, 4 Jun 2020 14:12:10 +0000 (UTC) Received: from localhost ([::1]:57512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgqbJ-0001Q9-Kp for larch@yhetil.org; Thu, 04 Jun 2020 10:12:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgqbC-0001OW-78 for bug-guix@gnu.org; Thu, 04 Jun 2020 10:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jgqbB-0005HR-U2 for bug-guix@gnu.org; Thu, 04 Jun 2020 10:12:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jgqbB-0004rj-OJ for bug-guix@gnu.org; Thu, 04 Jun 2020 10:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41604: guix pull impossible after rebasing a local repository Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 04 Jun 2020 14:12: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 41604-submit@debbugs.gnu.org id=B41604.159127990818683 (code B ref 41604); Thu, 04 Jun 2020 14:12:01 +0000 Received: (at 41604) by debbugs.gnu.org; 4 Jun 2020 14:11:48 +0000 Received: from localhost ([127.0.0.1]:47177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgqax-0004rH-SF for submit@debbugs.gnu.org; Thu, 04 Jun 2020 10:11:48 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:46082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgqav-0004r3-Tu for 41604@debbugs.gnu.org; Thu, 04 Jun 2020 10:11:46 -0400 Received: by mail-pl1-f195.google.com with SMTP id n2so2211992pld.13 for <41604@debbugs.gnu.org>; Thu, 04 Jun 2020 07:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=tMdV8pYFu38k5upLdvBVtTNFotCW2AkEaIteHysg0lc=; b=DeeCUdnX1u8uq6rcibyfYgrHU8UaxpNpbEKQyintAwR7tWJW1JvlRN81vtlFESBzlQ Zx/H7wHqRyBQemlWPRa8EpGgOPo1Bz0fYWmfk46yCEyjKKCNQn47TQBa/eqi3hnfGOSd 0t4r3UAxh1C+w8GbvWX+mqFAdMpfs8aFTSEyicKzzknGnVDpIJHN0I0kXW5AwyPS37Vq GJWd7Hhh0rdxitRryzWJNIolrwUpL2vpCPrjqBAFp/GW9blckq/qV9O1MjZ82oU/a4+T 3h+D981iq+RhFYYVP9OGrtqlik+ZKhSyzleYOaFlCMyyEKQf86SYZAG3ZffHemvT6v3v sFBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=tMdV8pYFu38k5upLdvBVtTNFotCW2AkEaIteHysg0lc=; b=FHA7U0hWqvUgGOE354Apd90PJ5ux0olUvMny4iJBfwS9SUaoDY3pD4lZrU9VHYFbOO iEUzJCH4GNxnB1EgTZyAUpzpxA5Pyn3fnIz2CKMIeO6Iy3tpvUSCi3PZEi7jOaIqdZyQ vXzpatrOtZY0DoQP3c10uHdjHxeshiVnB3HHgJJrOPzLLP46e6HgFceOxF4yW3+/4YT+ 7/M4MH46n/LsmfJJCHoJfe8sYyISDtIaIQXrf1Ab8zmQfMrYKOoGr4BYZrBvVNHpKflL hcRFWaKYO9akdtYTvU2ows7tNy/vmh+KoGoTS32xKDnPGDVXuOL/8S3YrZIRr1RSY7UU Dgyg== X-Gm-Message-State: AOAM533ftYNrQdsYlRehxNbHsYfmdnJ+B8fmpDMnGF6qaxXkq5Ewbr9a d0gSwQ3/KDpldGDG9FNYYzXOAk9yBgg= X-Google-Smtp-Source: ABdhPJwjCv0m9S6hOEMKsuxsIwj1gxeK2iQAWjr7SWC/kDIH0jD42AU4XqdDXTHHU5dZEHHfL1o7kQ== X-Received: by 2002:a17:90a:cc5:: with SMTP id 5mr6171335pjt.112.1591279899428; Thu, 04 Jun 2020 07:11:39 -0700 (PDT) Received: from ecenter ([2600:1700:83b0:8bd0::7bb]) by smtp.gmail.com with ESMTPSA id a12sm5830563pjw.35.2020.06.04.07.11.36 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jun 2020 07:11:37 -0700 (PDT) From: John Soo References: <87zh9qofw7.fsf@asu.edu> <87a71kqyzw.fsf@gnu.org> <878sh41cx5.fsf@asu.edu> <87img8mbci.fsf@gnu.org> Date: Thu, 04 Jun 2020 07:11:35 -0700 In-Reply-To: <87img8mbci.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Wed, 03 Jun 2020 17:13:17 +0200") Message-ID: <874krq2a5k.fsf@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=asu-edu.20150623.gappssmtp.com header.s=20150623 header.b=DeeCUdnX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=asu.edu (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: gr6j3eosX/Jm Hi Ludo, Ludovic Court=C3=A8s writes: > It supports unrelated Git histories. It could really be called > =E2=80=98--allow-anything=E2=80=99 but I thought it=E2=80=99d be less des= criptive. :-) > > 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=E2=80=99t 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, =E2=80=98--allow-downgrades=E2=80=99 does exactly what you need= , at least > that=E2=80=99s the intent. I=E2=80=99d argue that it=E2=80=99s also reas= onable to use it in > this case because obviously you know what you=E2=80=99re doing, and you= =E2=80=99re > pulling from a local Git repository, so that=E2=80=99s fine. 100% it does what I need. Thanks again, feel free to close. - John