From owner-freebsd-git@freebsd.org Sun Oct 4 18:03:44 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 537EC42EAE7 for ; Sun, 4 Oct 2020 18:03:44 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4C4BRz6yZRz4263 for ; Sun, 4 Oct 2020 18:03:43 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id EEDF442E8B6; Sun, 4 Oct 2020 18:03:43 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EEA3242E8B4 for ; Sun, 4 Oct 2020 18:03:43 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4BRz4N7fz421V; Sun, 4 Oct 2020 18:03:43 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 094I3gos001807; Sun, 4 Oct 2020 18:03:42 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 094I3gZE001806; Sun, 4 Oct 2020 11:03:42 -0700 (PDT) (envelope-from david) Date: Sun, 4 Oct 2020 11:03:42 -0700 From: David Wolfskill To: Ed Maste Cc: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= , git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20201004180342.GB1349@albert.catwhisker.org> References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> <20200926020946.GK1390@albert.catwhisker.org> <20200926124212.GL92039@acme.spoerlein.net> <20201003223531.GA77534@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="eAbsdosE1cNLO4uF" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4C4BRz4N7fz421V X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Oct 2020 18:03:44 -0000 --eAbsdosE1cNLO4uF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 04, 2020 at 01:49:03PM -0400, Ed Maste wrote: > ... > Indeed. Let me reiterate though that this is a consequence of > fine-tuning the conversion process; once the migration is complete it > should not happen again. Sure -- and I (at least half-)expected that: I am experimenting, so at this stage, I expect a loty of stuff to be tried and tossed. > Deleting and cloning again from scratch is a reasonable way to > interact with the repository during this stage. >=20 > > That is not waht I'm trying to do. I am trying to have a (separate) > > working copy (for each branch I use) that persists from day to day, and > > which I update from the repo shortly before I rebuild FreeBSD. >=20 > For the time being I think that you'd want to remove the bare repo and > worktrees, and recreate everything from scratch over a hash change. And that part's fine. Where I'm having a problem is for the (usual) case of "no hash change", but there have been commits to the source-of-truth: it appears that "git fetch --all" copies those to my local private mirror, but I don't see how to get my "worktree" updated. Thanks. Peace, david --=20 David H. Wolfskill david@catwhisker.org Donald Trump is just in it for the publicity (well, and the money). See http://www.catwhisker.org/~david/publickey.gpg for my public key. --eAbsdosE1cNLO4uF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl96Dn1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 Pckirgf/dJ1TTQTn0BJQEfvP0qwi1oIUawBaTY3R922SllVHy9GkcFye1RFRFtpN EOmca/IFw+a+L48d3o9m/oc0CRfsWvNnbALvjzQJuBRBuiYiuoFqHcxyQjnWMdqa dpMoyEJemqHoPfU097tJHUeiF5G8X4qVWGlhTga6mQh1kVypbagK3y8jMomdUSPu 8WLQqCWWcW4p+I1ftJSlgqVAVcp9IY1yy2xdyqN+0JYJA/AhKIed6tAccPP3C+qw qvJIT4pJmLxRmN4NSYfNEC99MlLTe2CTmELbHjvyDfMXyMgIMBxfxxw/DzKB3EPg 40ekrIYCsONK03jdsKHA+cn8KOZXig== =8asa -----END PGP SIGNATURE----- --eAbsdosE1cNLO4uF--