From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jun 5 21:02:23 2013 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0A30EA30; Wed, 5 Jun 2013 21:02:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EF7E31104; Wed, 5 Jun 2013 21:02:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r55L2MFR042991; Wed, 5 Jun 2013 21:02:22 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r55L2M4t042989; Wed, 5 Jun 2013 21:02:22 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201306052102.r55L2M4t042989@svn.freebsd.org> From: Bryan Drewery Date: Wed, 5 Jun 2013 21:02:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r320022 - svnadmin/hooks/scripts X-SVN-Group: ports-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2013 21:02:23 -0000 Author: bdrewery Date: Wed Jun 5 21:02:22 2013 New Revision: 320022 URL: http://svnweb.freebsd.org/changeset/ports/320022 Log: Show path in replacement error Modified: svnadmin/hooks/scripts/verify.py Modified: svnadmin/hooks/scripts/verify.py ============================================================================== --- svnadmin/hooks/scripts/verify.py Wed Jun 5 20:59:33 2013 (r320021) +++ svnadmin/hooks/scripts/verify.py Wed Jun 5 21:02:22 2013 (r320022) @@ -233,7 +233,7 @@ class ChangeReceiver(delta.Editor): # POLICY: file replacement is not allowed for path, change in fs.paths_changed(self.txn_root).iteritems(): if (change.change_kind == fs.path_change_replace): - self.do_fail('Do not replace a file. This will break the CVS exporter.\n') + self.do_fail('Do not replace a file. This will break the CVS exporter. Path: "%s"\n' % path) # Whew! core.svn_pool_destroy(subpool) From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jun 5 21:14:41 2013 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 89DE9FF; Wed, 5 Jun 2013 21:14:41 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7CA6F119B; Wed, 5 Jun 2013 21:14:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r55LEfRn046851; Wed, 5 Jun 2013 21:14:41 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r55LEfEv046850; Wed, 5 Jun 2013 21:14:41 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201306052114.r55LEfEv046850@svn.freebsd.org> From: Bryan Drewery Date: Wed, 5 Jun 2013 21:14:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r320023 - svnadmin/hooks/scripts X-SVN-Group: ports-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2013 21:14:41 -0000 Author: bdrewery Date: Wed Jun 5 21:14:40 2013 New Revision: 320023 URL: http://svnweb.freebsd.org/changeset/ports/320023 Log: Disable replacement check as it is being triggered on a port copy+modification. No file replacement was done Approved by: portmgr (implicit) Modified: svnadmin/hooks/scripts/verify.py Modified: svnadmin/hooks/scripts/verify.py ============================================================================== --- svnadmin/hooks/scripts/verify.py Wed Jun 5 21:02:22 2013 (r320022) +++ svnadmin/hooks/scripts/verify.py Wed Jun 5 21:14:40 2013 (r320023) @@ -231,9 +231,10 @@ class ChangeReceiver(delta.Editor): self.do_fail('Path "%s" needs to have "svn:executable" removed with "svn propdel".\n' % path) # POLICY: file replacement is not allowed - for path, change in fs.paths_changed(self.txn_root).iteritems(): - if (change.change_kind == fs.path_change_replace): - self.do_fail('Do not replace a file. This will break the CVS exporter. Path: "%s"\n' % path) + # Disable as a simple 'svn cp' resulted in this triggering + #for path, change in fs.paths_changed(self.txn_root).iteritems(): + # if (change.change_kind == fs.path_change_replace): + # self.do_fail('Do not replace a file. This will break the CVS exporter. Path: "%s"\n' % path) # Whew! core.svn_pool_destroy(subpool) From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jun 5 21:56:04 2013 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 36E0669E; Wed, 5 Jun 2013 21:56:04 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0D7441655; Wed, 5 Jun 2013 21:56:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r55Lu3Ml059911; Wed, 5 Jun 2013 21:56:03 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r55Lu3r4059910; Wed, 5 Jun 2013 21:56:03 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201306052156.r55Lu3r4059910@svn.freebsd.org> From: Bryan Drewery Date: Wed, 5 Jun 2013 21:56:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r320030 - svnadmin/hooks/scripts X-SVN-Group: ports-svnadmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2013 21:56:04 -0000 Author: bdrewery Date: Wed Jun 5 21:56:03 2013 New Revision: 320030 URL: http://svnweb.freebsd.org/changeset/ports/320030 Log: - Re-enable replacement check - While here, reword to remove CVS reference. This is being kept to avoid accidentally losing easily traceable history The problem in this case can be seen in r320026. The goocanvas port was updated in r320001, but the directory not updated before it was copied to goocanvas2. Hence, the directory had a different revision than the three files that were copied in. Added: head/graphics/goocanvas2/ - copied from r319967, head/graphics/goocanvas/ head/graphics/goocanvas2/files/ head/graphics/goocanvas2/files/patch-introspection (contents, props changed) Replaced: head/graphics/goocanvas2/Makefile - copied, changed from r320001, head/graphics/goocanvas/Makefile head/graphics/goocanvas2/distinfo - copied, changed from r320001, head/graphics/goocanvas/distinfo head/graphics/goocanvas2/pkg-plist - copied, changed from r320001, head/graphics/goocanvas/pkg-plist Approved by: portmgr (implicit) Modified: svnadmin/hooks/scripts/verify.py Modified: svnadmin/hooks/scripts/verify.py ============================================================================== --- svnadmin/hooks/scripts/verify.py Wed Jun 5 21:48:10 2013 (r320029) +++ svnadmin/hooks/scripts/verify.py Wed Jun 5 21:56:03 2013 (r320030) @@ -231,10 +231,9 @@ class ChangeReceiver(delta.Editor): self.do_fail('Path "%s" needs to have "svn:executable" removed with "svn propdel".\n' % path) # POLICY: file replacement is not allowed - # Disable as a simple 'svn cp' resulted in this triggering - #for path, change in fs.paths_changed(self.txn_root).iteritems(): - # if (change.change_kind == fs.path_change_replace): - # self.do_fail('Do not replace a file. This will break the CVS exporter. Path: "%s"\n' % path) + for path, change in fs.paths_changed(self.txn_root).iteritems(): + if (change.change_kind == fs.path_change_replace): + self.do_fail('Do not replace a file. This can lose history. Path: "%s"\n' % path) # Whew! core.svn_pool_destroy(subpool) From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jun 5 22:01:28 2013 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1E0FEA59 for ; Wed, 5 Jun 2013 22:01:28 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pb0-x236.google.com (mail-pb0-x236.google.com [IPv6:2607:f8b0:400e:c01::236]) by mx1.freebsd.org (Postfix) with ESMTP id ED22B16A5 for ; Wed, 5 Jun 2013 22:01:27 +0000 (UTC) Received: by mail-pb0-f54.google.com with SMTP id ro2so2376870pbb.13 for ; Wed, 05 Jun 2013 15:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=ng303lZty0YYry9ckqwXe36VJGsxCC6oDkm+R7s7kGw=; b=QjfuyV2H8koSXvkdCQeZofVF5pxTLx1H7uaBfzQCnChtRyOTk6mQS9jB4DSz+/hjES YlZ1o4LSPGVcUPkgIomoDft9iTkkaA6SV1Fm8+iAY/VgyuNNREdqNrcqVKX7ec6c2paM z7lSnkrBY3LmhKW4LYKxrDw28Snf3HltaKNgY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :x-gm-message-state; bh=ng303lZty0YYry9ckqwXe36VJGsxCC6oDkm+R7s7kGw=; b=Oss8Lm9TK1BDibRtcZ9zUI8qASu4impycZeFF00C/7NCuFFBZ7skUZHfePS7qrgg6U /2yBfsy/EX92jUug/pD7D0ZVoiBPMdLt+GgtVRtUlYNz4X65QsaH8tvmknJ0xooT55wI CW+JKyh08wHmhemtA7FXsWq43Brr6B+/M4Uu+GlFf6NtlZdhor4TbgldqO/3AQXyCwJG fFrVGnPeC2HTJ1eOPProkRqZAsnG0Og0aUS4bymJfNE3c8f32A2ouAVv/8TuY4KdF/9b 5FqwS4xThU0bIC5qExG42sQkHeC68aFxfCn63hrjQI8CW7LuTqBjlQxJH/ux8QVf/5re YHCQ== X-Received: by 10.66.250.131 with SMTP id zc3mr35678201pac.157.1370469687466; Wed, 05 Jun 2013 15:01:27 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.70.45.33 with HTTP; Wed, 5 Jun 2013 15:00:57 -0700 (PDT) In-Reply-To: <201306052156.r55Lu3r4059910@svn.freebsd.org> References: <201306052156.r55Lu3r4059910@svn.freebsd.org> From: Eitan Adler Date: Thu, 6 Jun 2013 00:00:57 +0200 X-Google-Sender-Auth: rEXatz99TA2qRkOO7U30CNTSeiU Message-ID: Subject: Re: svn commit: r320030 - svnadmin/hooks/scripts To: Bryan Drewery Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQmd5++bTA8J0Z9Bhne2liQ1uEhNWFiluz0jR23j1ei9rT1zntvj1DrvEk5jW0hgXtiWs32N Cc: svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2013 22:01:28 -0000 On 5 June 2013 23:56, Bryan Drewery wrote: > Author: bdrewery > Date: Wed Jun 5 21:56:03 2013 > New Revision: 320030 > URL: http://svnweb.freebsd.org/changeset/ports/320030 > > Log: > - Re-enable replacement check > - While here, reword to remove CVS reference. This is being > kept to avoid accidentally losing easily traceable history This does not help to avoid losing history and it could be trivially worked around by doing an remove and add in two separate commits. Its time to remove this check entirely. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-ports-svnadmin@FreeBSD.ORG Wed Jun 5 22:05:15 2013 Return-Path: Delivered-To: svn-ports-svnadmin@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 41E5DD38 for ; Wed, 5 Jun 2013 22:05:15 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 11F7116D2 for ; Wed, 5 Jun 2013 22:05:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r55M5E3B046753 for ; Wed, 5 Jun 2013 22:05:14 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r55M5E8G046717 for svn-ports-svnadmin@freebsd.org; Wed, 5 Jun 2013 22:05:14 GMT (envelope-from bdrewery) Received: (qmail 62869 invoked from network); 5 Jun 2013 17:05:12 -0500 Received: from unknown (HELO ?173.160.118.90?) (freebsd@shatow.net@173.160.118.90) by sweb.xzibition.com with ESMTPA; 5 Jun 2013 17:05:12 -0500 Message-ID: <51AFB617.4040104@FreeBSD.org> Date: Wed, 05 Jun 2013 17:05:11 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Eitan Adler Subject: Re: svn commit: r320030 - svnadmin/hooks/scripts References: <201306052156.r55Lu3r4059910@svn.freebsd.org> In-Reply-To: X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2RTTSJNHXICLBDBMCXHPL" Cc: svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-svnadmin@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for svnadmin of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2013 22:05:15 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2RTTSJNHXICLBDBMCXHPL Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 6/5/2013 5:00 PM, Eitan Adler wrote: > On 5 June 2013 23:56, Bryan Drewery wrote: >> Author: bdrewery >> Date: Wed Jun 5 21:56:03 2013 >> New Revision: 320030 >> URL: http://svnweb.freebsd.org/changeset/ports/320030 >> >> Log: >> - Re-enable replacement check >> - While here, reword to remove CVS reference. This is being >> kept to avoid accidentally losing easily traceable history >=20 > This does not help to avoid losing history and it could be trivially > worked around by doing an remove and add in two separate commits. Its > time to remove this check entirely. >=20 This is not what we decided. Yes it does help prevent history as if someone does svn rm and svn add it loses the direct history. You have to svn log at certain revisions, hence, 'easily traceable history' in my commit. If you really need to delete the history, then a svn rm and svn add in 2 commits is fine. It spells out your intent much clearer. --=20 Regards, Bryan Drewery ------enig2RTTSJNHXICLBDBMCXHPL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRr7YaAAoJEG54KsA8mwz5ff4P/Rb9S5ciWywUOnoBm0EE+UVW RfX1Ez2lScBFmpyHbWtQPhYNvIpqce0nKoAFRc8TAVGmqb0GCgrzDLyMmUaG7W3l gYc3IemUDj1dcazt2h/2xVFtCbZIMxIbBUMhukd3a8pgaPvJiD5Jy4nmTJXGC00n g1+Lqf8CAQ5VPvusN6LXAd/0f36tpiwNS84rWObugat+Eodiy9thSRhZlsUkB7DH asiLFe9F3F3hDBnAEfvY79JUEO12M3kigg5t9RL+mrPyPkW42mPb/ZjrMdScp9aE a6sw3tqUXknpr9sQg0LSQA3KBth6QEnsWjhZHKOd9TlYsJzdFAOtlC2xC3Pi+M50 NBwKmmxF9rJGFjS9Tkg0kVu4Wt2dlHeKoBzDRqfJyR3vw2p5oG8KRYVqee5Vqwc7 Yec92diE9/dT4cFKyO5u6P+wugBO1ge0fom0ncGuAWjV141XlLlqWDOYjEAJ+bFL N5wMYLKBmQykUvRlIdtepYbCpkfGh1ZdI3IK4z/i5VF3sab+Uc6BuX4qqQ/ypUHO 5XSN2aprj8Kns/I/iUK+nK/A8hIXJCW93Cm6XHJc9Tz+HDgZV7Bo87erAr3W2889 Mt3k9AE8hD/um+4B3ThNLIGYbxksXQXcFNmfCMM2QnDXzhopdI5ZU9N9tpYDice2 FIjZk1hyugebgxr15xC7 =UHFz -----END PGP SIGNATURE----- ------enig2RTTSJNHXICLBDBMCXHPL--