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)