From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham
	autolearn_force=no version=3.4.4
Received: (qmail 29901 invoked from network); 6 Jun 2021 22:45:21 -0000
Received: from 1ess.inri.net (216.126.196.35)
  by inbox.vuxu.org with ESMTPUTF8; 6 Jun 2021 22:45:21 -0000
Received: from mimir.eigenstate.org ([206.124.132.107]) by 1ess; Sun Jun  6 18:38:00 -0400 2021
Received: from abbatoir.myfiosgateway.com (pool-74-108-56-225.nycmny.fios.verizon.net [74.108.56.225])
	by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id 20a304c3 (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO)
	for <9front@9front.org>;
	Sun, 6 Jun 2021 15:11:08 -0700 (PDT)
Message-ID: <9C7C2E3FB35376F259797556A945821C@eigenstate.org>
To: 9front@9front.org
Date: Sun, 06 Jun 2021 18:11:06 -0400
From: ori@eigenstate.org
In-Reply-To: <E86CC74E1F38160B1583F23CA13A6A22@eigenstate.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: shader rich-client manager 
Subject: Re: [9front] moving to git
Reply-To: 9front@9front.org
Precedence: bulk

Quoth ori@eigenstate.org:
> We're moving our over to git, hosted on 9front:
> 
> 	http://git.9front.org
> 
> To move your system over, run sysupdate twice.


Git had some bugs that would clobber files on merge.
Including itself.

It be fixed, but if you sysupdated recently, you'll
need to get a fixed version of git, and revert some
files.

If you kept /dist/plan9front/.hg:

	# install a working git9
	hg pull -u https://code.9front.org/hg/plan9front
	cd /sys/src/cmd/git
	mk && mk install

	# revert the clobbered files
	hg revert /sys/src/cmd/git
	hg revert /sys/lib/git/common.rc
	hg revert /sys/lib/sysconfig/proto/distproto

if if you deleted /dist/plan9front/.hg:

	# install a working git9
	cd /tmp
	hget http://shithub.us/git/ori/git9/HEAD/snap.tar.gz | tar xvz
	cd git9
	mk && mk install
	cd /
	rm -r /tmp/git9

	# revert the clobbered files
	bind -ac /dist/plan9front/ /
	git/revert /sys/src/cmd/git
	git/revert /sys/lib/git/common.rc
	git/revert /sys/lib/sysconfig/proto/distproto

Then, as usual:

	sysupdate