Re: [9front] moving to git

[ori@eigenstate.org]

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.