sys/conf/newvers.sh vs. subversion-1.7

[David Wolfskill]

I got to wondering why the "uname -a" output from my head slice no
longer showed the SVN GRN after I had updated to subversion-1.7.0.1.

First thing I checked was that "svnversion" existed & worked; check.

Then I noticed the logic iin newvers.sh:

...
for dir in /bin /usr/bin /usr/local/bin; do
        if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
                svnversion=${dir}/svnversion
                break
        if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
                git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
                break
        fi
done
...

Well, as of subversion-1.7, we don't have a ".svn" directory in
${SYSDIR} any more -- it's only at the root of the working copy
(/usr/src, in this case).  So "svnversion" is never invoked.

So I've just hacked my copy to parallel the "git" stanza & look for
${SYSDIR}/../.svn,  Not sure that's ideal, but there appears to be
precedent.... :-}

It might be handy to resolve this prior to 9.0-RELEASE, I think.

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
Depriving a girl or boy of an opportunity for education is evil.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20111020/3ed08ce2/attachment.pgp