From owner-svn-ports-svnadmin@FreeBSD.ORG  Thu Jan 22 23:31:38 2015
Return-Path: <owner-svn-ports-svnadmin@FreeBSD.ORG>
Delivered-To: svn-ports-svnadmin@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 411F8488;
 Thu, 22 Jan 2015 23:31:38 +0000 (UTC)
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 2CC82795;
 Thu, 22 Jan 2015 23:31:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0MNVcId081531;
 Thu, 22 Jan 2015 23:31:38 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0MNVc7d081530;
 Thu, 22 Jan 2015 23:31:38 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201501222331.t0MNVc7d081530@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 22 Jan 2015 23:31:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r377703 - 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.18-1
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, 22 Jan 2015 23:31:38 -0000

Author: antoine
Date: Thu Jan 22 23:31:37 2015
New Revision: 377703
URL: https://svnweb.freebsd.org/changeset/ports/377703
QAT: https://qat.redports.org/buildarchive/r377703/

Log:
  Allow merging to project branches with lowercase letters and dashes
  
  With hat:	portmgr

Modified:
  svnadmin/hooks/scripts/mergeinfo.sh

Modified: svnadmin/hooks/scripts/mergeinfo.sh
==============================================================================
--- svnadmin/hooks/scripts/mergeinfo.sh	Thu Jan 22 22:56:06 2015	(r377702)
+++ svnadmin/hooks/scripts/mergeinfo.sh	Thu Jan 22 23:31:37 2015	(r377703)
@@ -24,7 +24,7 @@ for path in $PATH
 do 
   if $SVNLOOK proplist -t $TXN $REPO ${path} | /usr/bin/grep svn:mergeinfo
   then
-    if echo ${path} | /usr/bin/egrep -q -v '^branches/[A-Z0-9_]*/$|^tags/[A-Z0-9_]*/$|^projects/[A-Z0-9_]*/$'
+    if echo ${path} | /usr/bin/egrep -q -v '^branches/[A-Z0-9_]*/$|^tags/[A-Z0-9_]*/$|^projects/[A-Za-z0-9_-]*/$'
     then 
       echo "It seems that the mergeinfo is at the wrong place." >&2
       echo "Please double-check your commit and try committing again." >&2