Index: sys/conf/newvers.sh =================================================================== --- sys/conf/newvers.sh +++ sys/conf/newvers.sh @@ -192,7 +192,7 @@ if findvcs .hg; then for dir in /usr/bin /usr/local/bin; do if [ -x "${dir}/hg" ] ; then - hg_cmd="${dir}/hg -R ${VCSDIR}" + hg_cmd="${dir}/hg -R ${VCSDIR%/.hg}" break fi done @@ -268,8 +268,8 @@ if [ -n "$hg_cmd" ] ; then hg=`$hg_cmd id 2>/dev/null` - svn=`$hg_cmd svn info 2>/dev/null | \ - awk -F': ' '/Revision/ { print $2 }'` + svn=`$hg_cmd id --template "{svnrev}" \ + -r 'max(::. & fromsvn())' 2>/dev/null` if [ -n "$svn" ] ; then svn=" r${svn}" fi