svn commit: r389213 - svnadmin/hooks/scripts

Ryan Steinmetz zi at FreeBSD.org
Thu Jun 11 14:16:11 UTC 2015


Author: zi
Date: Thu Jun 11 14:16:10 2015
New Revision: 389213
URL: https://svnweb.freebsd.org/changeset/ports/389213

Log:
  - Add meaningful information to the error we send to a committer
  
  Approved by:	portmgr (bapt)

Modified:
  svnadmin/hooks/scripts/mergeinfo.sh

Modified: svnadmin/hooks/scripts/mergeinfo.sh
==============================================================================
--- svnadmin/hooks/scripts/mergeinfo.sh	Thu Jun 11 14:16:07 2015	(r389212)
+++ svnadmin/hooks/scripts/mergeinfo.sh	Thu Jun 11 14:16:10 2015	(r389213)
@@ -28,6 +28,7 @@ do 
     then 
       echo "It seems that the mergeinfo is at the wrong place." >&2
       echo "Please double-check your commit and try committing again." >&2
+      echo "This likely means you ran svn merge from a location other than the base of the branch." >&2
       exit 1
     fi
   fi 


More information about the svn-ports-svnadmin mailing list