From: Jacob Moody <moody@posixcafe.org>
To: 9front@9front.org
Subject: Re: [9front] diff suicide on sysupdate, now many removed files
Date: Fri, 12 Jan 2024 11:04:05 -0600 [thread overview]
Message-ID: <db4f6344-19ab-44c8-8bb7-7405546c5d77@posixcafe.org> (raw)
In-Reply-To: <187138119BEF7DA80FB843B036DF813D@eigenstate.org>
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.
next prev parent reply other threads:[~2024-01-12 17:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 6:04 Romano
2024-01-12 15:22 ` ori
2024-01-12 17:04 ` Jacob Moody [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-12 4:38 Romano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=db4f6344-19ab-44c8-8bb7-7405546c5d77@posixcafe.org \
--to=moody@posixcafe.org \
--cc=9front@9front.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).