Date: Mon, 3 May 2021 21:54:36 +0200 From: Stefan Esser <se@freebsd.org> To: Mathieu Arnold <mat@freebsd.org> Cc: FreeBSD ports <freebsd-ports@freebsd.org> Subject: Re: [SOLVED?] Recovery of deleted ports fails due to pre-commit checks Message-ID: <6041a16c-a114-2896-7162-39b59110b782@freebsd.org> In-Reply-To: <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc> References: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org> <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --bBwAWiA3hcE9ZDvlq083mINrt2zr4hhc7 Content-Type: multipart/mixed; boundary="ioC2Ic56X3O0ROVYFZLWwzFdUSHaKnG9a"; protected-headers="v1" From: Stefan Esser <se@freebsd.org> To: Mathieu Arnold <mat@freebsd.org> Cc: FreeBSD ports <freebsd-ports@freebsd.org> Message-ID: <6041a16c-a114-2896-7162-39b59110b782@freebsd.org> Subject: Re: [SOLVED?] Recovery of deleted ports fails due to pre-commit checks References: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org> <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc> In-Reply-To: <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc> --ioC2Ic56X3O0ROVYFZLWwzFdUSHaKnG9a Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Am 03.05.21 um 09:01 schrieb Mathieu Arnold: > 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: >> >> 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. >=20 > 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. I wanted to re-connect the resurrected files to the history of the port. And that works best, if unmodified files are committed first, changes applied and committed thereafter. Did you try "git log multimedia/transcode"? The history is there, back to 2002. --ioC2Ic56X3O0ROVYFZLWwzFdUSHaKnG9a-- --bBwAWiA3hcE9ZDvlq083mINrt2zr4hhc7 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmCQVPwFAwAAAAAACgkQR+u171r99UTn tAf/S0rp6LkHmXTdLp9ockNLLIgyxZXyVvG4QPG1icQbMZi1ancHt/chJ2bRnro52Ym9D1CRmicn CozA2BO9HLn5faqrgFncARM41BI37N5xzLrH75sFcNha3nXIOaKR06uhZObFnDK/edH2YXTepiXP Rvcz9w2LeegIbWM6tnWs3HaCeY7Q+P0/1kpe3+JRMBgVY7yzg4uIfdtnOVkKg8RKvNMHSQY5nDU9 M+lqgSx4p6d4hyeDHsPRjKBYUk3k/zv4vGGwC8F962fcvzRyljZA2k3qOmv+EnkImp/9D8a3LS6o b0faEGPg4J3GCKT3NLr+OdUxtCV7zxnU0n8sySvgig== =i26p -----END PGP SIGNATURE----- --bBwAWiA3hcE9ZDvlq083mINrt2zr4hhc7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6041a16c-a114-2896-7162-39b59110b782>