From nobody Tue Oct 05 07:48:26 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 47E0417E33E1; Tue, 5 Oct 2021 07:48:31 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HNqTC1Dhzz4RVx; Tue, 5 Oct 2021 07:48:31 +0000 (UTC) (envelope-from se@freebsd.org) Received: from [IPV6:2003:cd:5f26:fa00:c8f9:33a0:8499:2078] (p200300cd5f26fa00c8f933a084992078.dip0.t-ipconnect.de [IPv6:2003:cd:5f26:fa00:c8f9:33a0:8499:2078]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 48B212DE90; Tue, 5 Oct 2021 07:48:30 +0000 (UTC) (envelope-from se@freebsd.org) Message-ID: Date: Tue, 5 Oct 2021 09:48:26 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.1.2 Subject: Re: git: ded0d3d486eb - main - Add back Windows only VCXProj files Content-Language: en-US To: Jessica Clarke , Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202110042015.194KF6pt032075@gitrepo.freebsd.org> From: Stefan Esser In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------07HR1lYFMLHAqGQ445BAcwWM" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------07HR1lYFMLHAqGQ445BAcwWM Content-Type: multipart/mixed; boundary="------------2HbEKl1G50neiEd9rJpdlGNN"; protected-headers="v1" From: Stefan Esser To: Jessica Clarke , Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-ID: Subject: Re: git: ded0d3d486eb - main - Add back Windows only VCXProj files References: <202110042015.194KF6pt032075@gitrepo.freebsd.org> In-Reply-To: --------------2HbEKl1G50neiEd9rJpdlGNN Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am 05.10.21 um 01:10 schrieb Jessica Clarke: > On 5 Oct 2021, at 00:02, Mark Johnston wrote: >> >> On Mon, Oct 04, 2021 at 08:15:06PM +0000, Stefan E=C3=9Fer wrote: >>> The branch main has been updated by se: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dded0d3d486eba766f61307= 0de0ed12029a9a3816 >>> >>> commit ded0d3d486eba766f613070de0ed12029a9a3816 >>> Author: Stefan E=C3=9Fer >>> AuthorDate: 2021-07-28 13:35:16 +0000 >>> Commit: Stefan E=C3=9Fer >>> 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 --------------2HbEKl1G50neiEd9rJpdlGNN-- --------------07HR1lYFMLHAqGQ445BAcwWM Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmFcA0oFAwAAAAAACgkQR+u171r99UTS QAf/brri2p5Zx2eI5EasZTIY5iKFI0TDKfL8RF1siVG1XKPNqh/bWyU1KZqHQLVy/zAHWl171rwn 7RPQFiL5ZizNnYKlp+DykAm8G/iF7xSttyo/1cAdq+cZ5kJ+kc8c8jMUuOnUZ8scVMTfJSEfSWkS ej48iOHmr4RUlFuitfqpNQKe2xXpk3cf1FdZLCRGsyCJTJW0IyDFzE6g68f0+eTMBsNfW6+rRo4w U9nxWEjK6nWgoqf1oOTK13cU22qIN5vJXZue459tEgzb6CudRJ3zl1f6n1n100seqQMiaD92ZnSN UxOy+AWNLiMFEIaB7b9c7ewfCbDjbMVqFcrvyZCZUQ== =xoLJ -----END PGP SIGNATURE----- --------------07HR1lYFMLHAqGQ445BAcwWM--