Date: Thu, 22 Jan 2015 23:31:38 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-svnadmin@freebsd.org Subject: svn commit: r377703 - svnadmin/hooks/scripts Message-ID: <201501222331.t0MNVc7d081530@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501222331.t0MNVc7d081530>