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.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4
Received: (qmail 6817 invoked from network); 12 Jan 2024 17:05:15 -0000
Received: from 9front.inri.net (168.235.81.73)
  by inbox.vuxu.org with ESMTPUTF8; 12 Jan 2024 17:05:15 -0000
Received: from mail.posixcafe.org ([45.76.19.58]) by 9front; Fri Jan 12 12:04:07 -0500 2024
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posixcafe.org;
	s=20200506; t=1705079058;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=uAYFGxAJ3hufMFe+uxW5AbwPTjqv4Hf4oLN86iv5xW4=;
	b=FA7UjOT5fEeMBzwKoLGKEcQmi6N++WcYXhSY3lDiIS4Xu/bxV308qKgBLaP9Q3wDrGQTjx
	u9guZ0hGCuDxg66sMmF4Qjzy/Nb/9gtpaF+emj5AxfpSHneGIvRSkI1XoTuQkl8XZR/eMN
	tl74Gl3NLJPXfZcE8g3gey5ueXsbBpA=
Received: from [192.168.168.200] (<unknown> [207.45.82.38])
	by mail.posixcafe.org (OpenSMTPD) with ESMTPSA id 6684c99c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <9front@9front.org>;
	Fri, 12 Jan 2024 11:04:16 -0600 (CST)
Message-ID: <db4f6344-19ab-44c8-8bb7-7405546c5d77@posixcafe.org>
Date: Fri, 12 Jan 2024 11:04:05 -0600
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
To: 9front@9front.org
References: <187138119BEF7DA80FB843B036DF813D@eigenstate.org>
From: Jacob Moody <moody@posixcafe.org>
In-Reply-To: <187138119BEF7DA80FB843B036DF813D@eigenstate.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: webscale open-source extension high-performance-oriented out-scaling manager 
Subject: Re: [9front] diff suicide on sysupdate, now many removed files
Reply-To: 9front@9front.org
Precedence: bulk

On 1/12/24 09:22, ori@eigenstate.org wrote:
> Quoth Romano <unobe@cpan.org>:
>> I just ran sysupdate on a raspberry pi4 and had a flurry of diff
>> suicides, and ow the sysupdate shows everything is up-to-date when
>> indeed there are many missing files according to git/diff -s.  Look
>> familiar to anyone?
>>
>> http://okturing.com/src/18143/body
>>
> 
> ugh. this is a known bug in ape/diff3 and the ancient gnu diff
> that we have ported.
> 
> I need to finish up merge3(1). and kick out the ancient gnu
> utilities.
> 

Sure but we should also help people get unborked for the time being.
As I said in the other mail to Arne, you'll need to manually git/revert
things to match the latest commit that you pulled. The important part is
that you have all the commits you just need to manually fix the "checked out"
state of the repo.