svn commit: r377691 - svnadmin/hooks/scripts
Baptiste Daroussin
bapt at FreeBSD.org
Thu Jan 22 18:51:56 UTC 2015
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
More information about the svn-ports-svnadmin
mailing list