* [9front] diff suicide on sysupdate, now many removed files
@ 2024-01-12 4:38 Romano
0 siblings, 0 replies; 4+ messages in thread
From: Romano @ 2024-01-12 4:38 UTC (permalink / raw)
To: 9front
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [9front] diff suicide on sysupdate, now many removed files
@ 2024-01-12 6:04 Romano
2024-01-12 15:22 ` ori
0 siblings, 1 reply; 4+ messages in thread
From: Romano @ 2024-01-12 6:04 UTC (permalink / raw)
To: 9front
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [9front] diff suicide on sysupdate, now many removed files
2024-01-12 6:04 Romano
@ 2024-01-12 15:22 ` ori
2024-01-12 17:04 ` Jacob Moody
0 siblings, 1 reply; 4+ messages in thread
From: ori @ 2024-01-12 15:22 UTC (permalink / raw)
To: 9front
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [9front] diff suicide on sysupdate, now many removed files
2024-01-12 15:22 ` ori
@ 2024-01-12 17:04 ` Jacob Moody
0 siblings, 0 replies; 4+ messages in thread
From: Jacob Moody @ 2024-01-12 17:04 UTC (permalink / raw)
To: 9front
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-12 17:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-12 4:38 [9front] diff suicide on sysupdate, now many removed files Romano
2024-01-12 6:04 Romano
2024-01-12 15:22 ` ori
2024-01-12 17:04 ` Jacob Moody
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).