Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jun 2015 14:16:11 +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: r389213 - svnadmin/hooks/scripts
Message-ID:  <201506111416.t5BEGBig090700@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506111416.t5BEGBig090700>