Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Jan 2015 18:51:56 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org
Subject:   svn commit: r377691 - svnadmin/hooks/scripts
Message-ID:  <201501221851.t0MIpumX047575@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Jan 22 18:51:55 2015
New Revision: 377691
URL: https://svnweb.freebsd.org/changeset/ports/377691
QAT: https://qat.redports.org/buildarchive/r377691/

Log:
  Skip mergeingo checking for the projects branch the same it is done in tags and branches

Modified:
  svnadmin/hooks/scripts/mergeinfo.sh

Modified: svnadmin/hooks/scripts/mergeinfo.sh
==============================================================================
--- svnadmin/hooks/scripts/mergeinfo.sh	Thu Jan 22 18:01:38 2015	(r377690)
+++ svnadmin/hooks/scripts/mergeinfo.sh	Thu Jan 22 18:51:55 2015	(r377691)
@@ -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_]*/$'
+    if echo ${path} | /usr/bin/egrep -q -v '^branches/[A-Z0-9_]*/$|^tags/[A-Z0-9_]*/$|^projects/[A-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



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