Date: Mon, 3 May 2021 09:01:34 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Stefan Esser <se@freebsd.org> Cc: FreeBSD ports <freebsd-ports@freebsd.org> Subject: Re: [SOLVED?] Recovery of deleted ports fails due to pre-commit checks Message-ID: <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc> In-Reply-To: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org> References: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--hnsifsslb7u3wj7q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, May 01, 2021 at 09:01:02PM +0200, Stefan Esser wrote: > The recovery of deleted ports in their previous form is rejected > by the pre-commit checks on the repository server: >=20 > remote: > remote: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > remote: Do not commit ports without TIMESTAMP in their distinfo files. > remote: Rerun make makesum to add it. > remote: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > remote: >=20 > I have tried to revert the deletion with unchanged files and then > updated the ports' Makefiles and distinfo files in a later commit. >=20 > Pushing those commits all together fails with the message above, > and in order to not confuse GIT, deleted files should be committed > first, before applying any changes. This is not needed at all, Git cannot get confused by something it has no knowledge of. Once a file is deleted, or moved, the history tracking stops. --=20 Mathieu Arnold --hnsifsslb7u3wj7q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmCPn8lfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgJeAA//Qd3yeNY3XxCFxHvi5Lcbtd9EsUPpS5zViULdcsViz/IHtpG8vvYV0Wn0 aw5rg8cDld6WOD+PXqvqnQv5lR/ZacMMlae074yyEqUHSokmQelY3cpfbjnLJy/u 1RGrjCKUnym7b9mbUqDF6Dv/tmXtSQ8qprLlaGIv3g3PmHm5c60ccGjE9X806ans kx/Ac+A0a/uepCZDI7BeFTu/M0BkPHK2+LSty2z6pfaeOKwfWutUTPZX9LkKFx2O /H/6LW6/si15GSbbq08KAp0caoOwWoBUH6bWHIt8WVyUay9zLo4Jnb/r12zAMPCJ kf1la9kCqZPNQAkvUtIrpBvvy4LS3kZIoaBP72Y6KJCM0jAW+TUFvqTiL4fPkHVc qhVDcHiZndT54Nnu/UAQeZTGdxg2A7TuDC+HJ1CEkwOgMPw4zy/ZU2UpxDRTMdaR 2EKlGj+50s0spI7CLsb+OZd5RrSWerkKN7vXUMNPDltNVOp6fiuSgxURC3rxcLUO vVzPo5ML2QQWKvYOd826NjxM9IwK4Wt/ZiajOnTGPlMPO9E0jF2JKSrssQUGEmDn wvw5Fj91RKCcYhs6i65KJgfg/RWoRLfY2gwmVzhGKzPUeUyr9XPsqU5EX7Uiyd0m ubdJXO7rmjsu6pbBJ3D9lvn7cXUoGN8ZXE3qOpZJyhf6S0QNsbM= =iiQu -----END PGP SIGNATURE----- --hnsifsslb7u3wj7q--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210503070134.bydnbc2eah7st2on>