Date: Sat, 1 May 2021 21:01:02 +0200 From: Stefan Esser <se@freebsd.org> To: FreeBSD ports <freebsd-ports@freebsd.org> Subject: [SOLVED?] Recovery of deleted ports fails due to pre-commit checks Message-ID: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org>
next in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --IPIZnVnCQAe7gppuevDTiLbiFp3aCGwjZ Content-Type: multipart/mixed; boundary="YZgstvxrik5GzZZaoIiziyN0nc6knSwHU"; protected-headers="v1" From: Stefan Esser <se@freebsd.org> To: FreeBSD ports <freebsd-ports@freebsd.org> Message-ID: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org> Subject: [SOLVED?] Recovery of deleted ports fails due to pre-commit checks --YZgstvxrik5GzZZaoIiziyN0nc6knSwHU Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable The recovery of deleted ports in their previous form is rejected by the pre-commit checks on the repository server: 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: I have tried to revert the deletion with unchanged files and then updated the ports' Makefiles and distinfo files in a later commit. 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. Apparently this is not possible, and I cannot re-order the commits in such a way, that the distinfo change is merged in to the initial commit. I'm now going to try with 10 commits squashed into 1, to make the distinfo update appear to be part of the initial commit. This will make it much harder to distinguish the reversal of the deletion from later changes, though. The squashed commit has worked - the multimedia/transcode port and dependent ports that had been deleted should be restored and fixed. It is thus possible to commit a reverted port, but I had rather kept the commit log entries separate and more comprehensible. Regards, STefan --YZgstvxrik5GzZZaoIiziyN0nc6knSwHU-- --IPIZnVnCQAe7gppuevDTiLbiFp3aCGwjZ Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmCNpW4FAwAAAAAACgkQR+u171r99USa 8wf+KOEGdgBEvlOE5BzxMEHr6HovP55Hfhp06qQ6aAqeWGlWSc9f4xhmRfADibp+1rEX2MdRbdgI vSqMbXQT079EeZzJGJ4ZyT6/vmP2pKrQxq3V9c2/gz7BnUGMCbSWytHqg+zTDG83q1HgXG6+3TL9 KvegmaKBR00FSs5rvCIjEH8JlF5H4RWtQyzXWq/6wM1sPFL1Jusi0nJhSL7nl5jG/0L1IIeVWTog qWqJMmwgCQeF8PTzMAbvQPNrzRFgxgWbRB9xESZXDVOTtPOC09Fo0yC4SnZseY7NpjISPTljQkqs 54KXLNdYQmN3P7aQ4WfijANuBXSYjnEnfEbwdWaRgg== =NgnL -----END PGP SIGNATURE----- --IPIZnVnCQAe7gppuevDTiLbiFp3aCGwjZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2c1ab5d2-d885-8f8d-94dd-99d0a5559a88>