From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MD8CFk58sGFGLAEAgWs5BA (envelope-from ) for ; Wed, 08 Dec 2021 10:35:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8Im1EU58sGFlZgAAbx9fmQ (envelope-from ) for ; Wed, 08 Dec 2021 09:35:10 +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 1B3C215373 for ; Wed, 8 Dec 2021 10:35:10 +0100 (CET) Received: from localhost ([::1]:57738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mutLw-0006Fy-L4 for larch@yhetil.org; Wed, 08 Dec 2021 04:35:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mutLr-0006Fc-5q for guix-patches@gnu.org; Wed, 08 Dec 2021 04:35:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mutLq-0008Nz-Of for guix-patches@gnu.org; Wed, 08 Dec 2021 04:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mutLq-0003Vt-Ip for guix-patches@gnu.org; Wed, 08 Dec 2021 04:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52346] Using git worktrees Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Dec 2021 09:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52346 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: jgart Cc: 52346-done@debbugs.gnu.org Received: via spool by 52346-done@debbugs.gnu.org id=D52346.163895604413436 (code D ref 52346); Wed, 08 Dec 2021 09:35:02 +0000 Received: (at 52346-done) by debbugs.gnu.org; 8 Dec 2021 09:34:04 +0000 Received: from localhost ([127.0.0.1]:39566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mutKu-0003Ue-5G for submit@debbugs.gnu.org; Wed, 08 Dec 2021 04:34:04 -0500 Received: from flashner.co.il ([178.62.234.194]:47190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mutKs-0003UB-H5 for 52346-done@debbugs.gnu.org; Wed, 08 Dec 2021 04:34:03 -0500 Received: from localhost (unknown [94.230.83.253]) by flashner.co.il (Postfix) with ESMTPSA id 7A3BF40190; Wed, 8 Dec 2021 09:33:56 +0000 (UTC) Date: Wed, 8 Dec 2021 11:30:50 +0200 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , jgart , 52346-done@debbugs.gnu.org References: <20211207073039.18890-1-jgart@dismail.de> <8d12982b57795503ac59b509aeebe94bf5f41166.camel@ist.tugraz.at> <20211207050258.GB21708@gac.attlocal.net> <20211207162830.GB1527@gac.attlocal.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="uWplcdvFsZTf8yOU" Content-Disposition: inline In-Reply-To: <20211207162830.GB1527@gac.attlocal.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638956110; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=yAs90I2HIOztXkmdaWifmCq5FG9508jUY82ciW2dPgs=; b=TO77dK1yAA6ONhoqm3vaId5VLlt644pJhccU4q9JH7zjx0AMR1QvP7wAhi2A6ouwOubu8S aVctwR83f5nk7jkaja99ntqqbzdwY5VkNUwNrRFQQSuUkfr1rF0wsOCzhbu6UWimYS2NVR ltSaQjXoZvBvNUbFGAHIwo2iT+04jrpzILp3iCyMRzhhgZQc2EsWPhQgNIom+FhfMPAwnW fHz58PKtSFoKS/0Thedi4dICQ2tHUtwvuQZ3kCf/Y9if1SmF8DT9xbcKeHdix+RQveonWe qG0bsVDXEoqK3GiCdgbukvjFnCVYNVbR1tqkgu70k2Rn6PCvmgwYhRe1l2KWPg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638956110; a=rsa-sha256; cv=none; b=euf5Wf+k1yCEDsKXkUKvCunsqa0otC9AYkJwizzFCmj+quwafYzkpuCFOhh0m4EX05ryGU kytQNIHUAtQ+JTxQEPxFoPuLPfUpAoEg6pVX3BWQ4ECyhouTmq3dxyjUZtNmhaRONVpI7u hyom/Uzmw9fYpASu4ijildkp+OFUAAOjPZ597KhLsWhlj83KDI09rT6wnYm+XZ3oBTyJzM mu4rsYNU63/pIhDlUq8tJNzgjHd9QPL/gL7ONw4gCPlERHL8mjRWMIJGw+ycPq2NZdS352 V5XkGqMSV3p9/O69aNtRKkX0VanmuwFOXxFh6rklEuntNjWXLJh8rvUwei/F5g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.55 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 1B3C215373 X-Spam-Score: -4.55 X-Migadu-Scanner: scn1.migadu.com X-TUID: p2sTQNZTf5LE --uWplcdvFsZTf8yOU Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 07, 2021 at 04:28:30PM -0500, jgart wrote: > On Tue, 07 Dec 2021 13:50:52 +0200 Efraim Flashner wrote: > > On Tue, Dec 07, 2021 at 05:02:58AM -0500, jgart via Guix-patches via wr= ote: > > > On Tue, 07 Dec 2021 09:26:51 +0100 Liliana Marie Prikler wrote: > > > > This has already been taken care of on core-updates-frozen [1], have > > > > some patience ;) > > >=20 > > > hahah > > >=20 > > > How do you usually keep up to date with core-updates-frozen, etc...? > > >=20 > > > rss feeds, email list for cuf? > > >=20 > >=20 > > git worktrees :) >=20 > Efraim, >=20 > What's your workflow for using git worktrees when doing Guix development? >=20 > I remember Raghav using them and he showed me briefly but it felt a bit > like a branches, maybe cleaner for bootstrapping and switching to a new > tree. I didn't get around to incorporating it into my own workflow. >=20 > Any advice is much appreciated, >=20 > jgart It's quite expensive with Guix to switch between different branches due to the compiled guile code. By keeping different branches in different directories I can work on them concurrently without needing to recompile when switching between branches. It's basically like checking out the repository multiple times in different directories, but they all use the =2Egit folder from the original checkout. (ins)efraim@3900XT ~/workspace/guix$ git worktree list /home/efraim/workspace/guix ddcec589bc [master] /home/efraim/workspace/guix-core-updates ee03b51f6e [core-updates-froz= en] /home/efraim/workspace/guix-riscv 34758aca7c [wip-riscv] /home/efraim/workspace/guix-staging eec94982b1 [staging] /home/efraim/workspace/guix-upstream-keyring 702f4c7942 [keyring] /home/efraim/workspace/guix-wip-rust ed496cb639 [wip-rust] The basic command I follow is 'git worktree add ', so 'git worktree add ../guix-core-updates origin/core-updates-frozen'. Then I change it to what I actually wanted, a local branch named core-updates, tracking origin/core-updates-frozen (I can never get some of those commands correct). Then I run bootstrap, configure and make in that directory and I can work on both branches at the same time. I'm not sure about the syntax since I often seem to get the worktree and branching syntax wrong (and end up creating a local branch named origin/core-updates, tracking my local core-updates branch), but it's great for keeping track of everything at once. Once most of my wip-riscv branch is merged back in I'll remove the actual worktree with 'git worktree remove ' and then just keep the wip-riscv branch. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --uWplcdvFsZTf8yOU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmGwe0oACgkQQarn3Mo9 g1EwVBAAwav7DtOPe3G22RvJI87MzDdWMXsTnepcSU1gI3x9OipGOOcPYvS6Ak+v 4jO0oJFvgXpUT86mNuJ10YHTbLKQxT33aQYdJSRIwLqg6xMz8OpvyrmmtZYX8kB3 cbHiZoFlbZA7liDVZSfy2gqwzwalz5R91A50Mkn8BEReOqHwxSmgAAk1Ff1qugD6 JLd8YU7HCWimRizUhhQb0o22hnY+hWdQIapIzOn0PDakPApU1oGSDW/omD34msCq 6zUQfbjbU6S1oeZa4WYPvijaME4+U28D2/+YEaywH/X3vFhW817miEGgt/5NmIeU ycqDA3Ujv8TN5IKOMBv91mTY6hCWLXBvsh0urdeq+X9TVM3yeIUG1W55RF9lYmAO A7pIKVHA39SDiFuyQdmL/YEY++19lJDsl0Y3x2Y+wSmGM7XmxjVdXjJsnAWxFog/ z/qK9gmUi2jYS075aGMQxYb+aEvliJjkuO7AeqGL9GzWEfKyPTp5Z3BcCz/Sizgb nes9JcJDKKDgxv/unPSx9f/FBX+BVA8HLqrWgS/bifd+DrdjyPWUEeeLtnh4mbke 0VvesTgcr4tIlulb7wPKWt/StevqgnTMux7Tc5XtlLJRJ38z+6CUwRNLm0rb0RUC xQIIAI3qoTml/rpvvaBcRxxQm+ktvu1wGeP8ql15uf505PFhS5I= =f0cX -----END PGP SIGNATURE----- --uWplcdvFsZTf8yOU--