From owner-freebsd-current@FreeBSD.ORG  Thu Oct 20 11:48:45 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28032106566B
	for <current@freebsd.org>; Thu, 20 Oct 2011 11:48:45 +0000 (UTC)
	(envelope-from david@catwhisker.org)
Received: from albert.catwhisker.org (m209-73.dsl.rawbw.com [198.144.209.73])
	by mx1.freebsd.org (Postfix) with ESMTP id 02EAB8FC0A
	for <current@freebsd.org>; Thu, 20 Oct 2011 11:48:44 +0000 (UTC)
Received: from albert.catwhisker.org (localhost [127.0.0.1])
	by albert.catwhisker.org (8.14.5/8.14.5) with ESMTP id p9KBmisa074247
	for <current@freebsd.org>; Thu, 20 Oct 2011 04:48:44 -0700 (PDT)
	(envelope-from david@albert.catwhisker.org)
Received: (from david@localhost)
	by albert.catwhisker.org (8.14.5/8.14.5/Submit) id p9KBmiBW074246
	for current@freebsd.org; Thu, 20 Oct 2011 04:48:44 -0700 (PDT)
	(envelope-from david)
Date: Thu, 20 Oct 2011 04:48:44 -0700
From: David Wolfskill <david@catwhisker.org>
To: current@freebsd.org
Message-ID: <20111020114844.GK59810@albert.catwhisker.org>
Mail-Followup-To: David Wolfskill <david@catwhisker.org>, current@freebsd.org
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="yiup30KVCQiHUZFC"
Content-Disposition: inline
User-Agent: Mutt/1.4.2.3i
Cc: 
Subject: sys/conf/newvers.sh vs. subversion-1.7
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Oct 2011 11:48:45 -0000


--yiup30KVCQiHUZFC
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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:

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

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
--=20
David H. Wolfskill				david@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.

--yiup30KVCQiHUZFC
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)

iEYEARECAAYFAk6gCpsACgkQmprOCmdXAD35jwCeNEpvPqRPFGYHCG5SwW2dmhrE
9oEAn2CfXfAx/DW+gAxVZMZ+ccpGwuwx
=giK2
-----END PGP SIGNATURE-----

--yiup30KVCQiHUZFC--