9front - general discussion about 9front
 help / color / mirror / Atom feed
* [9front] moving to git
@ 2021-06-05 14:19 ori
  2021-06-05 14:34 ` ori
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: ori @ 2021-06-05 14:19 UTC (permalink / raw)
  To: 9front

We're moving our over to git, hosted on 9front:

	http://git.9front.org

To move your system over, run sysupdate twice.

The first run teaches sysupdate how to switch
to git. The second does the switch.

** For committers:

Auth is done using your contrib account.
email sl@stanleylieber.com to reset your
password.

Pushes are done using

	hjgit://git.9front.org/plan9front/plan9front

** Known issues

- commit emails have not been set up.
- full clones can be cpu intensive, which is
  why sysupdate fetches a seed tarball.


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-05 14:19 [9front] moving to git 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
  2 siblings, 2 replies; 10+ messages in thread
From: ori @ 2021-06-05 14:34 UTC (permalink / raw)
  To: 9front

Quoth ori@eigenstate.org:
> To move your system over, run sysupdate twice.

Also, before sysupdating: make sure you've
fully updated, and have a recent version
of /sys/src/cmd/git installed.


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-05 14:19 [9front] moving to git ori
  2021-06-05 14:34 ` ori
@ 2021-06-05 17:51 ` Steffen Nurpmeso
  2021-06-06 22:11 ` ori
  2 siblings, 0 replies; 10+ messages in thread
From: Steffen Nurpmeso @ 2021-06-05 17:51 UTC (permalink / raw)
  To: 9front

ori@eigenstate.org wrote in
 <E86CC74E1F38160B1583F23CA13A6A22@eigenstate.org>:
 |We're moving our over to git, hosted on 9front:
 |
 | http://git.9front.org

That is great news, really!  I would love to have the repository
around.

Is there a mirror on some public hoster?  Say repo.or.cz?  (In
mirror mode their bot comes flying by every hour or so, and syncs
as necessary.)

--steffen
|
|Der Kragenbaer,                The moon bear,
|der holt sich munter           he cheerfully and one by one
|einen nach dem anderen runter  wa.ks himself off
|(By Robert Gernhardt)

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-05 14:34 ` ori
@ 2021-06-06  0:04   ` cinap_lenrek
  2021-06-06 18:36   ` adr
  1 sibling, 0 replies; 10+ messages in thread
From: cinap_lenrek @ 2021-06-06  0:04 UTC (permalink / raw)
  To: 9front

UPDATE!

we discovered more issues and likely need to push a few fixes to
git9 before trying another migration... so i reverted the sysupdate
thumbstone (in mercurial) for now, which gives us a chance to update
git9 from mercurial...

pull was disabled on git.9front.org to prevent further damage which
is why some people who already updated now get tls errors on sysupdate.

DONT PANIC!

we'll provide instructions later once we understand the problem better
to recover from this.

--
cinap

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-05 14:34 ` ori
  2021-06-06  0:04   ` cinap_lenrek
@ 2021-06-06 18:36   ` adr
  1 sibling, 0 replies; 10+ messages in thread
From: adr @ 2021-06-06 18:36 UTC (permalink / raw)
  To: 9front

On Sat, Jun 05, 2021 at 07:34:51AM -0700, ori@eigenstate.org wrote:
> Quoth ori@eigenstate.org:
> > To move your system over, run sysupdate twice.
> 
> Also, before sysupdating: make sure you've
> fully updated, and have a recent version
> of /sys/src/cmd/git installed.
> 

I get stuck here:

; cd /
; bind -ac /dist/plan9front /
; git/pull -u gits://git.9front.org/plan9front/plan9front
tlsclient: tlsclient: i/o on hungup channel
/bin/git/pull: fetch 2000: sys: write on closed pipe pc=0x276d0

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-05 14:19 [9front] moving to git ori
  2021-06-05 14:34 ` ori
  2021-06-05 17:51 ` Steffen Nurpmeso
@ 2021-06-06 22:11 ` ori
  2021-06-06 23:07   ` ori
  2021-06-07 19:18   ` Xiao-Yong Jin
  2 siblings, 2 replies; 10+ messages in thread
From: ori @ 2021-06-06 22:11 UTC (permalink / raw)
  To: 9front

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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-06 22:11 ` ori
@ 2021-06-06 23:07   ` ori
  2021-06-07 19:18   ` Xiao-Yong Jin
  1 sibling, 0 replies; 10+ messages in thread
From: ori @ 2021-06-06 23:07 UTC (permalink / raw)
  To: 9front

Quoth ori@eigenstate.org:
> 
> 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

Forgot a step: hg gets confused if you
don't have an hgignore, and it may have
been removed:

	hg revert .hgignore

and then do the other steps.


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-06 22:11 ` ori
  2021-06-06 23:07   ` ori
@ 2021-06-07 19:18   ` Xiao-Yong Jin
  2021-06-07 20:42     ` ori
  1 sibling, 1 reply; 10+ messages in thread
From: Xiao-Yong Jin @ 2021-06-07 19:18 UTC (permalink / raw)
  To: 9front


> On Jun 6, 2021, at 5:11 PM, ori@eigenstate.org wrote:
> 
> 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

What would happen to local changes if I run sysupdate twice?
Particularly, for
(1) local uncommitted changes;
(2) local commits in hg.
What would be the recommended steps to preserve the locally
uncommitted and committed changes?


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-07 19:18   ` Xiao-Yong Jin
@ 2021-06-07 20:42     ` ori
  2021-06-10  1:34       ` Xiao-Yong Jin
  0 siblings, 1 reply; 10+ messages in thread
From: ori @ 2021-06-07 20:42 UTC (permalink / raw)
  To: 9front

Quoth Xiao-Yong Jin <meta.jxy@gmail.com>:
> 
> > On Jun 6, 2021, at 5:11 PM, ori@eigenstate.org wrote:
> > 
> > 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
> 
> What would happen to local changes if I run sysupdate twice?
> Particularly, for
> (1) local uncommitted changes;
> (2) local commits in hg.
> What would be the recommended steps to preserve the locally
> uncommitted and committed changes?
> 

Uncommitted local changes will be
treated the same as they are under
hg: 'git/pull' will merge the files
in the working tree with the files
that were modified in the commit,
conflicts will be flagged, and you'll
have a chance to resolve them.

Local changes committed to hg will
be treated as uncommitted local
changes.

If you want to preserve them as commits,
it's a bit more complciated. You can
export the changes from hg, touching
them up to the format that git expects:

	for(c in $commits){
		hg export -g $commit -g | \
		ssam 's/^# HG changeset patch\n//' | \
		ssam 's/^# User /From: /' | \
		ssam 's/^# Parent[^\n]*\n/Subject: [PATCH] /' | \
		ssam 's/^# Node ID[^\n]*\n/' \
		> /tmp/$commit.export
	}

clone to a temporary location:

	cd /tmp
	git/clone gits://git.9front.org/plan9front/plan9front

and then import them:

	for(c in /tmp/*.export)
		cd /tmp/plan9front && git/import $c

then, pulling should merge them nicely
for you:

	sysupdate && sysypdate
	git/pull /tmp/plan9front

or even just dircp the repo over:

	dircp /tmp/plan9front/.git /dist/plan9front/.git

And, so long as you have .hg around,
you can always use the hg commands
to diff, revert, or undo any breakage.


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [9front] moving to git
  2021-06-07 20:42     ` ori
@ 2021-06-10  1:34       ` Xiao-Yong Jin
  0 siblings, 0 replies; 10+ messages in thread
From: Xiao-Yong Jin @ 2021-06-10  1:34 UTC (permalink / raw)
  To: 9front

Thanks! The switching to git9 was super smooth.
It was a much better experience than FreeBSD's transition.
The idea of using a snapshot .git is brilliant.


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-06-12  9:15 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-05 14:19 [9front] moving to git 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
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

9front - general discussion about 9front

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/9front

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 9front 9front/ http://inbox.vuxu.org/9front \
		9front@9front.org
	public-inbox-index 9front

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.archive.9front


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git