Date: Fri, 21 Oct 2011 14:30:14 GMT From: David Wolfskill <david@catwhisker.org> To: freebsd-bugs@FreeBSD.org Subject: Re: conf/161835: [patch] SVN-detection in sys/conf/newvers.sh fails with subversion-1.7 Message-ID: <201110211430.p9LEUEVm022531@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR conf/161835; it has been noted by GNATS. From: David Wolfskill <david@catwhisker.org> To: Jilles Tjoelker <jilles@stack.nl> Cc: bug-followup@FreeBSD.org Subject: Re: conf/161835: [patch] SVN-detection in sys/conf/newvers.sh fails with subversion-1.7 Date: Fri, 21 Oct 2011 06:47:15 -0700 --G2d+m75Tjo442KmM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 21, 2011 at 02:42:24PM +0200, Jilles Tjoelker wrote: > > [patch to cope with different location of 1.7's .svn] >=20 > This patch will not work if the root of the checkout is not the root of > the source tree..... Would that concern also apply to the "git" stanza (immediately following the proposed patch in stock newvers.sh? (I don't use git, and have little interest in it; my concern here is for logical consistency.) Do you have a suggestion for a better patch? I'd be happy to see (and use!) one. Fundamentally, I believe newvers.sh would be better off avoiding explicit code to deal with particular SCMs, and instead, try to source a file of some specific (documented) name (e.g., "scm_version") from a specified small ordered list of directories; the file could have the logic to determine whatever "tag" (e.g., SVN GRN) should be inserted into the uname string. The project could initially provide a sample/default version that would work (say) for the default case of SVN & branch-specific working copies, and folks who care "sufficiently" about using other environments (SVN with multiple branches in the same working copy; using git as an SCM; ...) could provide (and commit) those. It would then be up to the person who chooses a non-default confiuration to (also) rename the appropriate file (or redirect a symlink). Then newvers.sh itself could be SCM-agnostic, which I believe would be a win for all concerned. But I also believe that it's rather late in the 9.0 release cycle to be doing that sort of thing, and last time I tried to express that idea (when the git stanza was being proposed), there didn't seem to be much interest in pursuing it. In any case: I'd be very pleased to see an improved patch; in the mean time, I believe that the patch I proposed: * does little (if any) harm; * improves the situation for the default configuration. (Note that as of a few days ago, the default subversion port installs 1.7, and the existing code in newvers.sh does not work in that case.) 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. --G2d+m75Tjo442KmM Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk6hd+IACgkQmprOCmdXAD3VlQCfRTwgFAHyE1Ct15LFtsxbMs63 TCIAmwQPx13vY3ZEjqGwMoXK5oy5T3Ej =n05D -----END PGP SIGNATURE----- --G2d+m75Tjo442KmM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110211430.p9LEUEVm022531>