svn commit: r377703 - svnadmin/hooks/scripts
Antoine Brodin
antoine at FreeBSD.org
Thu Jan 22 23:31:38 UTC 2015
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
More information about the svn-ports-svnadmin
mailing list