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

[David Wolfskill]

On Fri, Oct 21, 2011 at 04:36:05PM -0400, John Baldwin wrote:
> ...
> > > 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.
> > > ...
> ...

> Hmm, that won't always work, the problem is if someone just checks out a 
> kernel tree then .svn will be in SYSDIR.  Alternatively, if you have a tree 
> like mine which has work/freebsd/svn/ with various subdirs (head/, stable/ 
> with subdirs for 7, 8, 9) but all rooted at the upperlevel, just looking two 
> levels up won't work.

OK...  How about (untested) something like:

Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh	(revision 226724)
+++ sys/conf/newvers.sh	(working copy)
@@ -88,7 +88,7 @@
 i=`${MAKE:-make} -V KERN_IDENT`
 
 for dir in /bin /usr/bin /usr/local/bin; do
-	if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
+	if [ ( -d "${SYSDIR}/.svn" -o -d "${SYSDIR}/../.svn" ) -a -x "${dir}/svnversion" ] ; then
 		svnversion=${dir}/svnversion
 		break
 	fi

then?  That should preserve current behavior for the case you & Jilles
expressed concern about, while repairing the currently-broken default
case.

I believe it's in the interest of the project to have that default
case working again (at least) in time for 9.0-RELEASE.

Please.

> ....

I'm staying out of the "svnversion vs. svn info" branch of the thread.

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/20111025/6058d8ec/attachment.pgp