From owner-svn-ports-all@freebsd.org Wed Dec 16 02:42:44 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1FD9A4981F for ; Wed, 16 Dec 2015 02:42:44 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from vfemail.net (onethreetwo.vfemail.net [199.16.11.132]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7739F178C for ; Wed, 16 Dec 2015 02:42:43 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: (qmail 46724 invoked by uid 89); 16 Dec 2015 02:42:36 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 16 Dec 2015 02:42:35 -0000 Received: (qmail 46697 invoked by uid 89); 16 Dec 2015 02:42:18 -0000 Received: by simscan 1.3.1 ppid: 46690, pid: 46693, t: 0.0049s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 16 Dec 2015 02:42:18 -0000 Received: (qmail 1517 invoked by uid 89); 16 Dec 2015 02:42:18 -0000 Received: by simscan 1.4.0 ppid: 1489, pid: 1503, t: 1.0930s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by mail.vfemail.net with ESMTPA; 16 Dec 2015 02:42:17 -0000 From: Jan Beich To: ports-committers@freebsd.org, Cc: svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r403829 - in head/devel: android-tools-adb android-tools-adb-devel android-tools-adb-devel/files android-tools-adb/files android-tools-fastboot-devel android-tools-fastboot-devel/files References: <201512160155.tBG1tjCX091428@repo.freebsd.org> Date: Wed, 16 Dec 2015 03:41:58 +0100 In-Reply-To: <201512160155.tBG1tjCX091428@repo.freebsd.org> (Jan Beich's message of "Wed, 16 Dec 2015 01:55:45 +0000 (UTC)") Message-ID: <7fkf-jert-wny@vfemail.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2015 02:42:44 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Jan Beich writes: > Added: [...] > head/devel/android-tools-fastboot-devel/files/pkg-message.in (content= s, props changed) > head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp (conten= ts, props changed) > head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp (conte= nts, props changed) Oops, the history is gone after not being careful with git-svn. $ cd devel/android-tools-fastboot-devel $ for f in pkg-message.in usb_freebsd.cpp util_freebsd.cpp; do=20 svn rm -q files/$f svn cp -q ../android-tools-fastboot/files/$f files/ done $ svn st R + files/pkg-message.in R + files/usb_freebsd.cpp R + files/util_freebsd.cpp $ svn di | patch -REfsp0 $ svn di $ svn ci -m 'devel/android-tools-fastboot-devel: restore history lost in = r403829' Replacing files/pkg-message.in Replacing files/usb_freebsd.cpp Replacing files/util_freebsd.cpp Transmitting file data .done Committing transaction... svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not replace a file. This can lose history. Path: "/head/devel/android-= tools-fastboot-devel/files/util_freebsd.cpp" =3D=3D Additional errors may compound and may not be accurate =3D=3D Do not replace a file. This can lose history. Path: "/head/devel/android-= tools-fastboot-devel/files/usb_freebsd.cpp" Do not replace a file. This can lose history. Path: "/head/devel/android-= tools-fastboot-devel/files/pkg-message.in" =3D=3D Pre-commit problem count: 3 Alternatively $ cd devel/android-tools-fastboot-devel $ svn cp -q files@403828 files.new $ for f in pkg-message.in usb_freebsd.cpp util_freebsd.cpp; do=20 svn cp -q ../android-tools-fastboot/files/$f files.new/ done $ mv files/* files.new/ $ svn rm -q files $ svn mv -q files.new files $ svn st R + files M + files/Makefile A + files/pkg-message.in A + files/usb_freebsd.cpp A + files/util_freebsd.cpp $ svn di =20=20 $ svn ci -m 'devel/android-tools-fastboot-devel: restore history lost in = r403829' Replacing files Sending files/Makefile Adding files/pkg-message.in Adding files/usb_freebsd.cpp Adding files/util_freebsd.cpp Transmitting file data ..done Committing transaction... svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not replace a file. This can lose history. Path: "/head/devel/android-= tools-fastboot-devel/files" =3D=3D Additional errors may compound and may not be accurate =3D=3D Do not replace a file. This can lose history. Path: "/head/devel/android-= tools-fastboot-devel/files" =3D=3D Pre-commit problem count: 2 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJWcM92XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3baIsH/36l2x+DKeuKDQkaunjn8Fff UQVsNbTyX2T3kXLD9oSRvkGPP3kkCp61sECKwSPY4lScWV8xbRe5pzhiK7fObboW OJR6rUJzME/dzfYDI0fPnRZYyStON/XV5R3oVtvXiKjSkGnS76RQlcg2vpYSlGE4 9d3Q+vn7QhoavjNW9SjzB4+626ebmaGXO9hU9fsmUZYzGYNbRRTAwtEbSdt/F7re H176GT4LEUvNF4MbNbKiTcf9q9QLunVFFqSgnQWxS1o1hItJv4MwwzSQcU6KNxpB 2Rp8cM6EAdfqrvxg/N55NGOYIjtvsOZJ9IzCYsF6dnZqfJXr78mfyEgnf+RriZE= =qZoM -----END PGP SIGNATURE----- --=-=-=--