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 3021 invoked from network); 7 Jun 2021 23:17:16 -0000
Received: from 1ess.inri.net (216.126.196.35)
  by inbox.vuxu.org with ESMTPUTF8; 7 Jun 2021 23:17:16 -0000
Received: from mimir.eigenstate.org ([206.124.132.107]) by 1ess; Mon Jun  7 16:48:58 -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 7a72d461 (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO)
	for <9front@9front.org>;
	Mon, 7 Jun 2021 13:42:07 -0700 (PDT)
Message-ID: <138F2FE710DBC5DB1AF5F75155C65BB4@eigenstate.org>
To: 9front@9front.org
Date: Mon, 07 Jun 2021 16:42:05 -0400
From: ori@eigenstate.org
In-Reply-To: <2EE39354-0BF2-4DF4-B158-05BB0AA7F3C8@gmail.com>
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: social cloud-scale JSON over SOAP GPU-scale injection-aware optimizer 
Subject: Re: [9front] moving to git
Reply-To: 9front@9front.org
Precedence: bulk

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.