9front - general discussion about 9front
 help / color / mirror / Atom feed
From: ori@eigenstate.org
To: 9front@9front.org
Subject: Re: [9front] moving to git
Date: Sun, 06 Jun 2021 18:11:06 -0400	[thread overview]
Message-ID: <9C7C2E3FB35376F259797556A945821C@eigenstate.org> (raw)
In-Reply-To: <E86CC74E1F38160B1583F23CA13A6A22@eigenstate.org>

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


  parent reply	other threads:[~2021-06-06 22:45 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-05 14:19 ori
2021-06-05 14:34 ` ori
2021-06-06  0:04   ` cinap_lenrek
2021-06-06 18:36   ` adr
2021-06-05 17:51 ` Steffen Nurpmeso
2021-06-06 22:11 ` ori [this message]
2021-06-06 23:07   ` ori
2021-06-07 19:18   ` Xiao-Yong Jin
2021-06-07 20:42     ` ori
2021-06-10  1:34       ` Xiao-Yong Jin
2021-06-28 18:07         ` Stuart Morrow
2021-06-28 18:15           ` Kurt H Maier
2021-06-28 18:34           ` ori
2021-06-28 18:47             ` Stuart Morrow

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9C7C2E3FB35376F259797556A945821C@eigenstate.org \
    --to=ori@eigenstate.org \
    --cc=9front@9front.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).