Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Feb 2019 12:40:34 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org
Subject:   svn commit: r493666 - svnadmin/hooks/scripts
Message-ID:  <201902231240.x1NCeY9L009122@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Sat Feb 23 12:40:33 2019
New Revision: 493666
URL: https://svnweb.freebsd.org/changeset/ports/493666

Log:
  - Further clarify error/required action
  
  Approved by:	portmgr (implicit, noop)

Modified:
  svnadmin/hooks/scripts/verify.py

Modified: svnadmin/hooks/scripts/verify.py
==============================================================================
--- svnadmin/hooks/scripts/verify.py	Sat Feb 23 12:24:22 2019	(r493665)
+++ svnadmin/hooks/scripts/verify.py	Sat Feb 23 12:40:33 2019	(r493666)
@@ -234,7 +234,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 can lose history. Try: svn cp;svn commit, then add your changes and commit.  Path: "%s"\n' % path)
+        self.do_fail('Do not replace a file, this can lose history. You must edit the files in place.  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?201902231240.x1NCeY9L009122>