From owner-svn-ports-head@freebsd.org Thu Feb 15 09:29:58 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56EF4F0C125; Thu, 15 Feb 2018 09:29:58 +0000 (UTC) (envelope-from romain@blogreen.org) Received: from marvin.blogreen.org (blogreen.org [151.127.25.53]) by mx1.freebsd.org (Postfix) with ESMTP id A3C386D103; Thu, 15 Feb 2018 09:29:57 +0000 (UTC) (envelope-from romain@blogreen.org) Received: by marvin.blogreen.org (Postfix, from userid 1001) id 9BE393A630; Thu, 15 Feb 2018 10:29:56 +0100 (CET) Date: Thu, 15 Feb 2018 10:29:56 +0100 From: Romain =?iso-8859-1?Q?Tarti=E8re?= To: Mathieu Arnold Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r461866 - head/textproc/elasticsearch6 Message-ID: <20180215092955.GA7597@blogreen.org> References: <201802150848.w1F8mBiN078077@repo.freebsd.org> <20180215091117.sxvhk6bieryxs6qe@atuin.in.mat.cc> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="azLHFNyN32YCQGCU" Content-Disposition: inline In-Reply-To: <20180215091117.sxvhk6bieryxs6qe@atuin.in.mat.cc> X-PGP-Key: http://romain.blogreen.org/pubkey.asc User-Agent: Mutt/1.9.3 (2018-01-21) X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 09:29:58 -0000 --azLHFNyN32YCQGCU Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 15, 2018 at 10:11:17AM +0100, Mathieu Arnold wrote: > On Thu, Feb 15, 2018 at 08:48:11AM +0000, Romain Tarti=E8re wrote: > > Author: romain > > Date: Thu Feb 15 08:48:11 2018 > > New Revision: 461866 > > URL: https://svnweb.freebsd.org/changeset/ports/461866 > >=20 > > Log: > > Copy textproc/elasticsearch5 to textproc/elasticsearch6 > > =20 > > History was lost during textproc/elasticsearch6 creation, and other f= ixes are > > required but our pre-commit hook do not allow doing everything atomic= ally. >=20 > It does let you do it atomically. You run svn copy, and then **PATCH** > the files. On the other hand, to make sure things are not lost, it does > not let you **REPLACE** files. -- START OF DETAILED STEPS -- I did this: 1. svn up elasticsearch5 elasticsearch6 2. cp -R elasticsearch6 elasticsearch6.final 3. svn delete elasticsearch6 4. svn copy elasticsearch5 elasticsearch6 5. meld elasticsearch6 elasticsearch6.final # And sync what was not up-to-date 6. svn delete elasticsearch6/files/patch-bin_elasticsearch elasticsearch6= /files/patch-bin_elasticsearch.in.sh # Remove extra files 7. svn commit elasticsearch6 The exact error message was ---------------------------------- 8< ---------------------------------- svn: E165001: =C9chec de la propagation (commit), d=E9tails=A0:=20 svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not replace a file. This can lose history. Path: "/head/textproc/elastic= search6" =3D=3D Additional errors may compound and may not be accurate =3D=3D Do not replace a file. This can lose history. Path: "/head/textproc/elastic= search6" Do not replace a file. This can lose history. Path: "/head/textproc/elastic= search6" Do not replace a file. This can lose history. Path: "/head/textproc/elastic= search6" =3D=3D Pre-commit problem count: 4 ---------------------------------- 8< ---------------------------------- Since the error message was related to the parent directory, I though I was trying to do too much in a single commit. Since I already `svn delete + svn copy' in the past, I decided to do checkpoint commit between steps 4 and 5. -- END OF DETAILED STEPS -- Do you mean that the problem is that the i-node of the files in the elasticsearch6 directory changed? --=20 Romain Tarti=E8re http://people.FreeBSD.org/~romain/ pgp: 8234 9A78 E7C0 B807 0B59 80FF BA4D 1D95 5112 336F (ID: 0x5112336F) (plain text =3Dnon-HTML=3D PGP/GPG encrypted/signed e-mail much appreciated) --azLHFNyN32YCQGCU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEgjSaeOfAuAcLWYD/uk0dlVESM28FAlqFUxMACgkQuk0dlVES M28NJgv9HKWZsjng48fYWrKGhR9rJABBlGZ+VuZqJ8BouVhF6LrkOCE4fvn0a8T3 Ky6Vg4VpEL5Dm8LcmCnZoCjDOpSzrNCUpvRGN9cEqS8f5UapxWqCdP30Ra/MV8rC wAQg2tH2IFem8EbVKCjyOh7FZ8LRT/GtedhEkxW1QWLQ3KYC+GguWsc4vzze93CL Pig6N12SDa5u0qYOeyyCn7xARBuLqC59nQxKUrVYJ40qyBbT+Q6QQfGrSUCQiJGT ahd5llmST3O6xuk7NBu1ASVimF3mtQMsvUfeM0QrnLiYhMSORQnDZne4JzwDgtuQ jrHjt3CIzb7AaWw6TqFd9i+PlxjBT1KkYn23/Takc9bbrPVWcaMweN97/On0AKBe Ag5SBIYkHrUWtsmkwzNDaaaabQ1Xuz8Ft+rmdbfA6hIKqNF+a37phzZyo3AqUw6j ZO99CaDuC2wGOukDDKFaT6KgS0Lqkf0UL6iI272JYZrnASLfmHj4AxFG4M1jl0AL hO9szOVy =gnaI -----END PGP SIGNATURE----- --azLHFNyN32YCQGCU--