From debbugs-submit-bounces@debbugs.gnu.org Sat May 30 12:18:36 2020 Received: (at 41604) by debbugs.gnu.org; 30 May 2020 16:18:36 +0000 Received: from localhost ([127.0.0.1]:58944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jf4Bw-0005uq-Ew for submit@debbugs.gnu.org; Sat, 30 May 2020 12:18:36 -0400 Received: from mout.web.de ([212.227.15.3]:36099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jf4Bu-0005ub-KF for 41604@debbugs.gnu.org; Sat, 30 May 2020 12:18:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1590855502; bh=Ows9YC/tTa4GgzllsQh4ot0jovSQGvS9NbPMTHwYWiw=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:In-reply-to:Date; b=sf3eDKaH9lcC6pwQBBNNjsyn6GiamakZDfECzvO6AfGitEbCQHkQ2iJ4fVzrxRrxe 6MeRHx0fRMbdz8bvJf3gVhikv+zo6tIJi5qEvshGtj+hC6U4WR7TQ6k+wNdWpfig3P lzR0OJ323E3jCNpaeU0kT1TmXvjARgDkzNS3fHYM= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from fluss ([80.136.16.82]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MgAJ8-1j46LI0AIQ-00hfnP; Sat, 30 May 2020 18:18:22 +0200 References: <87zh9qofw7.fsf@asu.edu> <87r1v2oefd.fsf@asu.edu> <87k10uob2f.fsf@asu.edu> <87ftbinoo7.fsf@asu.edu> User-agent: mu4e 1.4.4; emacs 26.3 From: Arne Babenhauserheide To: John Soo Subject: Re: bug#41604: guix pull impossible after rebasing a local repository In-reply-to: <87ftbinoo7.fsf@asu.edu> Date: Sat, 30 May 2020 18:18:21 +0200 Message-ID: <87tuzxgzw2.fsf@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:aycdIdjdpuHIuJpJVarhHtr55XYf+z5gZRvgOSRhNO2h9funZ5W HV1gZwt7LTSEZGGqan+7WtxjMzxD0qsodVjF4iAejJztMtWUn5H4otf/X9csfhsYmIvuedh dnJwlZ0pjkukBRl2J7XDNaEl2j2QI0Ck1VMbJzqjWOe50G43v60TG9UPWT5FDEp52wory7J 62fHmCN95tLR0WMHFE2yg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:0LsDC35aWTQ=:kk4fJA6doS4kFoCtqf+46Z +QvNXvKix/bJ44c9EfubM8SP1oCSzFHZ2LPRIbMJGj/09XpDtiC9PkzKys4Ra35LPFM6fXMtB XPl+z7CJ5S1hkqImlDa985S62R/kkTfDGuU/ybX+mVFPtQRwkYFQm0Vsq8d/KBZOhlwXcc9FJ L7NudN8j9eXmyAO2Alg25HJfq4/zSZ1wzeDtPnb91P/cjjDJJhTX8QraUXB9BfhiEjTqAfpVh Wm5+sIIQhdgRJ0OaZjxXxVdkjAUeh9VS/HoagA+SOwH+p+Xz3PKEI33Mcv6YhPdzZjBezJ0Gi YkXCPj5uDm5HnbznSBoE2RY7palEgJ+YywScIpDKWnJ9WSfC3DAAUkaOTuHSBISqFsYqUIIQ2 cugY27zlhWB/jZLZ0ep64QN3ezYL8nU8gyRHuZ5xNF9fMiqMHcEg0CbzzCDaGQa3ZZnVdP9Zj ZF4wil6FsNUpKKfEiUZch3GqTAwsjXmJAowXB7nTHu+VqyRJ7tu0y6UruRUKA1Vgbpy+NEXNU j7qQdUOvdhqVMn1i86pHYw7HsesIUgWIScVC3wsi6ip+/juhvof3Nnvgs7btGRjwdY77McJxa Ci3jUPJDMUkxgj0WLCRl3sn8cI+Pfo0Zwty5PXZk5axgQKTwRHBQHbEIK6pWyMUQoKfx8TRHj lae11+dqhMUdyF/ZJlIztRO/FfmJGKjZJenN/lrDEaMuGUoMP0OLdQjN+fWOSSzAoFv1xU7EB bO4p/hWYKh3XAKgIoQpQR9ST3CZ3ihpzXCAFFmn05Oe6bU/cfTfnzh8wxjveTnG9VL7aOnJpU 8pbQZG7o9GIMeWchyRbM907QRPa2d4CHJcCpMWycG/Q1lLtsaiWY87yerubAj0YnQ+w8skPQH ol/HphBohVvPHNuLeAocw4ug8bUHSvS9XO2A+oIahLF92htw7LZldPgHS8rTx6aFDl9OiiiUk miik9F5FqG34IRKI7+VL9sIatN59pUWwrc7o9eGClc8oImyV/WDTDmiom2MhDn7mwNxpfkPhb lxB45GfilgxB2jLkCV1yneAAKvf9GiL0jE9zuIF6NTN8/rYMIriY98OxPf7JxxXFwJywZkCh7 WMwMqFD2tluBc06WhbZOFm/vnOoARY5Q7A8nlSGBdUmIx8cwU88PURv2PAhpGxtoxQUaZBZLe 5OAR72tzfPwShoySqVfe4+M9JKO1vvENlFgajQwSW0TzbiQhLC9Pln3/jGUNvcs5IxkyK3rN8 EuzcAAouMgdjgVrk9 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 41604 Cc: 41604@debbugs.gnu.org, bug-guix@gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) John Soo writes: > I guess that makes me wonder what the desired specification is. > There is a lot of problem space to explore. As a user I would want to > be able to take my local patches as "the real truth". > > Because guix has a linear git history, that means the user needs to > always rebase. Often I have patches open for months that I am currently > testing and working on. It would be convenient for me to be able to guix > pull into my default user profile. > > On the other hand, as you point out, using a hash that disappears from > the git history is dangerous. The git history no longer tracks the guix > pull history and then there may exist pulls in history that may never be > recoverable. > > There seems to be some existing support for the rebasing into the > default profile since branches are allowed as references in the channels > configuration. Has the rebase use case been discussed before? Oh, also, > history items can be deleted in other places with --delete-generations > and friends. I am not sure what to classify this problem, bug or > something else. > > What do you think? 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. Problem: It not possible with Git. It would require switching to Mercurial =E2=80=94 which would also enable useful abilities like coordinat= ed rebasing in a group: https://blog.disy.net/hg-evolution/ (and which is GPLv3-compatible) Best wishes, Arne --=20 Unpolitisch sein hei=C3=9Ft politisch sein ohne es zu merken