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.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no
	version=3.4.4
Received: (qmail 12483 invoked from network); 7 Jun 2021 19:50:56 -0000
Received: from 1ess.inri.net (216.126.196.35)
  by inbox.vuxu.org with ESMTPUTF8; 7 Jun 2021 19:50:56 -0000
Received: from mail-il1-f179.google.com ([209.85.166.179]) by 1ess; Mon Jun  7 15:18:54 -0400 2021
Received: by mail-il1-f179.google.com with SMTP id a8so16086642ilv.9
        for <9front@9front.org>; Mon, 07 Jun 2021 12:18:50 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:content-transfer-encoding:mime-version:subject:date:references
         :to:in-reply-to:message-id;
        bh=xCJ3S90h40rnqGUVxYvZ1Nkk2UmOznsNT2g4QTRo5z8=;
        b=oa95Dl4TolTpTDmDqHcDHoeuAQECYK7nEcWqEjSBkR7LldDQUa0GyUcH+EKp21N1f4
         lTHMg68fnCPF6FcLor15PaIB5ukkQ4m+Zx9ALAhRElVRsXByMkxDw8cvoNYoVipv1By+
         eaVHrYuh4Ut7pxnRugL+ETaIz/rJYetb3uIuBhuttvZVecGzaqdYr4qJKE01wIw0uyNP
         BaMRdn0BPaqVv4VNGF/yQdx7Zq2bDE7AzNPvmI843ATdz7W/t9H7a7GZlZphr/HxeGqM
         K9EiXF9wXrU0EAeMxmk/cIDzalXZXL7YGw28Pc4eooV0U8QiRsmEHYHo3DyxVX1+TeTl
         KfQg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:content-transfer-encoding:mime-version
         :subject:date:references:to:in-reply-to:message-id;
        bh=xCJ3S90h40rnqGUVxYvZ1Nkk2UmOznsNT2g4QTRo5z8=;
        b=SnUQ+zOW0R81pY8PeayQkifVu8NhhHmmEkQ7+qah+z6akttQczk6fKsokV+TIrnEaA
         Vbwj9xAf9PeoEdKCWmiws71cEpImiwpv1N/MjKQTL67JOMKLgQ/t+m46ra7MyT1NnGrX
         1egtlLRiVEtGJFfrtWQlvZhOfQT1PtfZb9UiypdHVPV/lWCB+q9I2v83mjW9+1Fmp+Dj
         3ZEa/E6SEaZGgD1ZkHT4otmd3V00OyX9xNApEg8O0JNZASzNUCtvWNdzQTlcVe5pFH85
         SkZIS/3pVfo1s9Seb5Nhw3siC17tf7/r3lAxRp9hwwIoGM6K9/4iLoQ5I0mI78nFTWot
         0/Og==
X-Gm-Message-State: AOAM531QOoF/o706WI3221QZJwCyIPNUCykjJm5c8O+0riVzuwkEJp5B
	/tX581j2pjy83316StnBHkd2dmjorbQ=
X-Google-Smtp-Source: ABdhPJyJ/omOgJkXN1S2xR9GUElrbsU2CW0CgnUYxD6YM5T0OATHVt0EBcE30oWYEs6n+jVbIHJW+w==
X-Received: by 2002:a92:c78d:: with SMTP id c13mr15817383ilk.205.1623093528416;
        Mon, 07 Jun 2021 12:18:48 -0700 (PDT)
Return-Path: <meta.jxy@gmail.com>
Received: from smtpclient.apple (c-67-184-39-205.hsd1.il.comcast.net. [67.184.39.205])
        by smtp.gmail.com with ESMTPSA id p9sm5012311ilc.63.2021.06.07.12.18.47
        for <9front@9front.org>
        (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
        Mon, 07 Jun 2021 12:18:47 -0700 (PDT)
From: Xiao-Yong Jin <meta.jxy@gmail.com>
Content-Type: text/plain;
	charset=us-ascii
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.100.0.2.22\))
Date: Mon, 7 Jun 2021 14:18:46 -0500
References: <9C7C2E3FB35376F259797556A945821C@eigenstate.org>
To: 9front@9front.org
In-Reply-To: <9C7C2E3FB35376F259797556A945821C@eigenstate.org>
Message-Id: <2EE39354-0BF2-4DF4-B158-05BB0AA7F3C8@gmail.com>
X-Mailer: Apple Mail (2.3654.100.0.2.22)
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: NoSQL realtime-java general-purpose-based framework 
Subject: Re: [9front] moving to git
Reply-To: 9front@9front.org
Precedence: bulk


> 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?