Re: git: ded0d3d486eb - main - Add back Windows only VCXProj files

Am 05.10.21 um 01:10 schrieb Jessica Clarke:
> On 5 Oct 2021, at 00:02, Mark Johnston <markj@freebsd.org> wrote:
>>
>> On Mon, Oct 04, 2021 at 08:15:06PM +0000, Stefan Eßer wrote:
>>> The branch main has been updated by se:
>>>
>>> URL: https://cgit.FreeBSD.org/src/commit/?id=ded0d3d486eba766f613070de0ed12029a9a3816
>>>
>>> commit ded0d3d486eba766f613070de0ed12029a9a3816
>>> Author:     Stefan Eßer <se@FreeBSD.org>
>>> AuthorDate: 2021-07-28 13:35:16 +0000
>>> Commit:     Stefan Eßer <se@FreeBSD.org>
>>> CommitDate: 2021-10-04 20:10:52 +0000
>>>
>>>    Add back Windows only VCXProj files
>>> ---
>>> bc.vcxproj          | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>> bc.vcxproj.filters  | 182 ++++++++++++++++++++++++++++++++++
>>> bcl.vcxproj         | 161 ++++++++++++++++++++++++++++++
>>> bcl.vcxproj.filters |  96 ++++++++++++++++++
>>> 4 files changed, 717 insertions(+)
>>
>> Presumably these should instead have been added under contrib/bc?

No - they should not have been there. I did not notice that they
were put into the root of the source tree, I definitely did not
put them there. I performed a diff -r to verify the contents of
contrib/bc matched vendor/bc - but had not assumed or noticed that
there appeared files outside my work directory. (And I did not add
them to the commit. I used "git add -A ." in contrib/bc and had
not thought about the possibility that files outside that directory
could become part of the commit.)

I'm still fighting a lot with git and although I understand its
concepts and data structures often do not get the results I wanted
to achieve.

> I think they were meant to go into the root of the vendor branch, given
> the last import in the branch also lost them, not just the subtree
> merge (and then presumably merged into contrib/bc).

I have no idea how this old issue resurfaced during this commit.

There was an issue with the CR-LF line separators used in these
files and .gitattributes missing in the initial commit, since I
had not been aware of the special handling of those files.

This has been corrected in the repository, but during this commit
a rebase was performed and somehow two old commits survived into
the commit of the MFV of bc-5.1.0 to contrib/bc (where these files
actually have been moved into a "vs" sub-directory with modified
contents).

It seems that git did resurrect those files not in contrib/bc but
in /usr/src for reasons that I do not understand. It seems that
git somehow replayed the old commit (see the AuthorDate from July)
but at a made up place ...

I'll delete these files and I hope they'll not show up in any further
commit I do in this area. I'll take more care to check the (long)
list of files that are part of the MFV.

Thanks for notifying me and sorry for messing up the repository
with that commit.

Regards, STefan