From owner-freebsd-ports@freebsd.org Mon May 3 19:54:38 2021 Return-Path: Delivered-To: freebsd-ports@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B347063C133 for ; Mon, 3 May 2021 19:54:38 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4FYtwZ4cTdz3Qmv; Mon, 3 May 2021 19:54:38 +0000 (UTC) (envelope-from se@freebsd.org) Received: from Stefans-MBP-449.fritz.box (p200300cd5f1fe9007117440609eb3937.dip0.t-ipconnect.de [IPv6:2003:cd:5f1f:e900:7117:4406:9eb:3937]) (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 293202A9D1; Mon, 3 May 2021 19:54:38 +0000 (UTC) (envelope-from se@freebsd.org) To: Mathieu Arnold Cc: FreeBSD ports References: <2c1ab5d2-d885-8f8d-94dd-99d0a5559a88@freebsd.org> <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc> From: Stefan Esser Subject: Re: [SOLVED?] Recovery of deleted ports fails due to pre-commit checks Message-ID: <6041a16c-a114-2896-7162-39b59110b782@freebsd.org> Date: Mon, 3 May 2021 21:54:36 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210503070134.bydnbc2eah7st2on@aching.in.mat.cc> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bBwAWiA3hcE9ZDvlq083mINrt2zr4hhc7" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2021 19:54:38 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --bBwAWiA3hcE9ZDvlq083mINrt2zr4hhc7 Content-Type: multipart/mixed; boundary="ioC2Ic56X3O0ROVYFZLWwzFdUSHaKnG9a"; protected-headers="v1" From: Stefan Esser To: Mathieu Arnold Cc: FreeBSD ports 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--