Re: git: 2e089a89812b - stable/15 - Add a few missed files to ObsoleteFiles.inc

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Tue, 28 Jul 2026 13:08:20 UTC 
On 28 Jul 2026, at 13:50, Dimitry Andric <dim@FreeBSD.org> wrote:
> 
> On 28 Jul 2026, at 11:50, Dag-Erling Smørgrav <des@FreeBSD.org> wrote:
>> 
>> Dag-Erling Smørgrav <des@FreeBSD.org> writes:
>>> Dimitry Andric <dim@FreeBSD.org> writes:
>>>>   Add a few missed files to ObsoleteFiles.inc
>>>> 
>>>>   There were still some left-over files under usr/tests/gnu/usr.bin/diff,
>>>>   causing the directory to not be fully removed. Add these to OLD_FILES.
>>>> 
>>>>   Fixes:          134a4c78d070
>>>>   (cherry picked from commit f72cfefae99befe47fefc4683cd6957edaaf0e86)
>>> These files and directories are still being recreated on every
>>> installworld.  This should have gone into OptionalObsoleteFiles.inc like
>>> I asked you.
>> 
>> stable/15 and stable/14 are still broken because of this, please fix at
>> your earliest convenience.
> 
> Sorry, I seem to have missed the earlier mail. I think the directories don't have to be created at all, since GNU diff is gone in both stable/15 and 14? So probably best to remove them from /etc/mtree/BSD.tests.dists instead of messing with OptionalObsoleteFiles.
> 
> I need to have a look on a stable/15 machine first, to see what is actually happening on installation.

The situation seems rather convoluted, and I don't have time to figure out a complete solution, so I have simply reverted my changes in both branches.

-Dimitry