From owner-svn-ports-svnadmin@FreeBSD.ORG  Thu Jun 11 14:16:11 2015
Return-Path: <owner-svn-ports-svnadmin@FreeBSD.ORG>
Delivered-To: svn-ports-svnadmin@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A3CE1E9D;
 Thu, 11 Jun 2015 14:16:11 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5C4F219DE;
 Thu, 11 Jun 2015 14:16:11 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5BEGBo9090701;
 Thu, 11 Jun 2015 14:16:11 GMT (envelope-from zi@FreeBSD.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5BEGBig090700;
 Thu, 11 Jun 2015 14:16:11 GMT (envelope-from zi@FreeBSD.org)
Message-Id: <201506111416.t5BEGBig090700@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org
 using -f
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Thu, 11 Jun 2015 14:16:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r389213 - 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.20
Precedence: list
List-Id: SVN commit messages for svnadmin of the ports tree
 <svn-ports-svnadmin.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-svnadmin>, 
 <mailto:svn-ports-svnadmin-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-svnadmin/>
List-Post: <mailto:svn-ports-svnadmin@freebsd.org>
List-Help: <mailto:svn-ports-svnadmin-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-svnadmin>, 
 <mailto:svn-ports-svnadmin-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2015 14:16:11 -0000

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