Date: Wed, 5 Jun 2013 21:56:03 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r320030 - svnadmin/hooks/scripts Message-ID: <201306052156.r55Lu3r4059910@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306052156.r55Lu3r4059910>