From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uKLMALku1V6hNAAA0tVLHw (envelope-from ) for ; Mon, 01 Jun 2020 16:37:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id mJhBOLgu1V5BYwAA1q6Kng (envelope-from ) for ; Mon, 01 Jun 2020 16:37:12 +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 546DF94066A for ; Mon, 1 Jun 2020 16:37:12 +0000 (UTC) Received: from localhost ([::1]:36298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfnQz-000622-NI for larch@yhetil.org; Mon, 01 Jun 2020 12:37:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfnQs-00061i-7y for bug-guix@gnu.org; Mon, 01 Jun 2020 12:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfnQr-0007hi-VH for bug-guix@gnu.org; Mon, 01 Jun 2020 12:37:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfnQr-0001EH-TQ for bug-guix@gnu.org; Mon, 01 Jun 2020 12:37: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: Mon, 01 Jun 2020 16:37: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: Arne Babenhauserheide X-Debbugs-Original-Cc: 41604@debbugs.gnu.org, bug-guix@gnu.org, John Soo Received: via spool by submit@debbugs.gnu.org id=B.15910293844662 (code B ref -1); Mon, 01 Jun 2020 16:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Jun 2020 16:36:24 +0000 Received: from localhost ([127.0.0.1]:36860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfnQF-0001D8-UZ for submit@debbugs.gnu.org; Mon, 01 Jun 2020 12:36:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:38470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfnQ3-0001Ce-6P for submit@debbugs.gnu.org; Mon, 01 Jun 2020 12:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfnQ2-0005w3-W1 for bug-guix@gnu.org; Mon, 01 Jun 2020 12:36:10 -0400 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:35523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfnPz-0007dk-T4 for bug-guix@gnu.org; Mon, 01 Jun 2020 12:36:10 -0400 Received: by mail-qk1-x72c.google.com with SMTP id n141so9675368qke.2 for ; Mon, 01 Jun 2020 09:36:07 -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:content-transfer-encoding; bh=/Y9CJ2Gr+YomBpRUpetMj99MgAu5+koG78u5CAbYM30=; b=YQdQa3wsZDsQtdxOQYM2yL8BRg0eslRjTs2QHxDXVveEfdzpnQmcqTtKreqfDErSuP QJRBxjQrfElU/zQPLQcDrbnXNJftQTNVUPNswS9ngUMlwYbcCJf2Lf0g1ESA4Cxy4lQd djPspF0Bx/1Dj6ef2aX9szaglqUI/6kFAul60Zhv/lBngpiPPs3XeoiB/3H2XZkDs8VB KDpoIqf6YinerkWN1T3ONIc8+i5WUsoXKVcnWWsgJIKMlrqDe48tArjXFvFKrvB8Nv7I 5+JrNYngdXNdPS6/64im6KRHUvofJUnkXrAaG1/dNCUZLL6ufBgMXdnQvcavbR2ZPlmw idgQ== 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:content-transfer-encoding; bh=/Y9CJ2Gr+YomBpRUpetMj99MgAu5+koG78u5CAbYM30=; b=AiP6bhpzz3ZtyNyc/3bL+Ahqxj8mUJkEFzD7mXPtFDundbv+P0+hqRW/1fvUu5N67e foUMQl7pgwTiNK9kgORfmxVLsjhY56wrlGH/yxBrgn/Seyjnj+bKP3NaU7xRi7IPZ+ld GEzYv9shm1vI2dws/ForINPMp1vBeFGRMuJarkq14l0L+mjvOQNPpS7XtSPXe2Zed6wF FseCT75TymN1nlMdV7ZquPoalSs7mhnGxrtxv0MDM7dhhG+H7miCqUVC5YKAJLbyWeiL 151Ir3J4mOzuAmzp5CTnMmUZeZ9vSdTQQMmDbIHWq7i6XbXXaYM74XrLbhjqnfuTQymf Arsg== X-Gm-Message-State: AOAM532Qt9e45k1yoHAW7jEo+4l+HzYpzYmMBq3JRO83F6oV9Yc2TrqW EKkbpt9wkdQndDHDbz/Yd8Fwjg0uGQIITFt8p54= X-Google-Smtp-Source: ABdhPJwNiC2izXti+x8Y/L8HmOvfYAOpDzwV+qT1bLmGiptl+23n/npWeyLz8YfP1II/OXQWK5Hli1bdsd+/OGFRzrI= X-Received: by 2002:a05:620a:15da:: with SMTP id o26mr18954174qkm.304.1591029366934; Mon, 01 Jun 2020 09:36:06 -0700 (PDT) MIME-Version: 1.0 References: <87zh9qofw7.fsf@asu.edu> <87r1v2oefd.fsf@asu.edu> <87k10uob2f.fsf@asu.edu> <87ftbinoo7.fsf@asu.edu> <87tuzxgzw2.fsf@web.de> In-Reply-To: <87tuzxgzw2.fsf@web.de> From: zimoun Date: Mon, 1 Jun 2020 18:35:55 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::72c; envelope-from=zimon.toutoune@gmail.com; helo=mail-qk1-x72c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) 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, jsoo1@asu.edu 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=YQdQa3ws; 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: nNM0gg3Y/plL Dear Arne, On Sat, 30 May 2020 at 18:18, Arne Babenhauserheide wrote= : > This sounds like a use-case for changeset evolution with > hidden-but-retrievable commits: > https://www.mercurial-scm.org/doc/evolution/index.html > > With that you can rebase and have linear surface history, but the > rewritten commits still exist as hidden commits with references to the > commits that superseded them. Thank you for the pointer. Yes it could be cool that "git rebase -i" still stores the rewritten commits as hidden -- which would be removed by "git gc". However, IMHO, the question seems more about how to the use the weapon than the weapon itself. Other said, it seems more an issue about practise than tool. Well, rewrite the history is always dangerous, whatever the tools; and one solution when one is not sure is to duplicate the branch with e.g., "git branch --copy". In this use-case, there is 2 incompatible requirements: - content-addressed for reproducibility etc. well the core principles of G= uix - rewrite these addresses on the fly Well, without care, for sure it would break one way or another, whatever the tool is, IMHO. > Problem: It not possible with Git. It would require switching to > Mercurial =E2=80=94 which would also enable useful abilities like coordin= ated > rebasing in a group: https://blog.disy.net/hg-evolution/ > (and which is GPLv3-compatible) I am sad too that 'hg' has lost against 'git'. All my PhD was under mercurial and I was really happy with it; tool easier to grab. Now, I am happier with Magit. ;-) Speaking about DVSC, pijul and theory of patches looks very interesting. Whatever! :-) https://pijul.org/ All the best, simon