Date: Sun, 15 Dec 2013 18:51:51 -0500 From: Glen Barber <gjb@FreeBSD.org> To: Thomas Mueller <mueller6724@bellsouth.net> Cc: freebsd-stable@freebsd.org Subject: Re: Holdover error in /usr/src/Makefile.inc1 Message-ID: <20131215235150.GF1446@glenbarber.us> In-Reply-To: <172923.6929.bm@smtp119.sbc.mail.bf1.yahoo.com> References: <BD.8C.08130.AC05DA25@cdptpa-oedge02> <20131215065233.GR3794@glenbarber.us> <20131215160216.GU3794@glenbarber.us> <172923.6929.bm@smtp119.sbc.mail.bf1.yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--VuQYccsttdhdIfIP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 15, 2013 at 11:43:47PM +0000, Thomas Mueller wrote: > > On Sun, Dec 15, 2013 at 06:48:42AM +0000, Thomas Mueller wrote: > > > In Makefile in the top directory of the source tree, there is a part = that > > > appears to be in error, a holdover from before HEAD-10 branched into = STABLE-10 > > > and HEAD-11: >=20 > > > SVN?=3D /usr/local/bin/svn > > > SVNFLAGS?=3D -r HEAD >=20 > > > I guess they forgot to change that line? >=20 > > Which one? >=20 > > '-r HEAD' refers to 'HEAD' (or latest revision) of the top of the tree > > (in the case of stable/10, it would be stable/10@rHEAD). >=20 >=20 > Sorry, I forgot to be clearer. >=20 > SVN and SVNFLAGS lines are in $SRCDIR/Makefile.inc1 for both HEAD and sta= ble/10. >=20 > Quite appropriate for HEAD, but not for stable/10. >=20 > It seems to me "SVNFLAGS?=3D -r HEAD" would switch stable/10 source tree = to HEAD. Right or wrong? >=20 Wrong. '-rHEAD' is the 'HEAD' *revision*, not branch. Glen --VuQYccsttdhdIfIP Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJSrkCWAAoJELls3eqvi17Q8voQALHWv0RhtWMbAQk7VM2Qd075 f4baiTWvA8TX6irmP4UMyy2PvWiGCAgxsf+/VyM/y6VvU9I0WRQmaIjPz8nANyg0 Kp/N+Uf/vqp3qnAZB7cEbWk6/RN+ah2mliOvnkgqvse7GVyhQouhof4MpGJ4dqAw p5xw9lOl18PthGvpzeQh6ue/6mH5ecvyUK9XSXP2gVgLDMzatmexy3djNw2lAgWn r4JVMb8vRwzjK1j9PSYMQ1Zpd2RqbSGyEk296mZC6wQ4ox18sYANHfdTvVbeQfxa nTkK0rG4QI4dfBk9kwIGWFiUo9plhr1IxEB1vL1QUvVYMrs2EEYUu20U1LTWGKAn UJqpDxuatpY2GAZsnjcLtZOOo+wiRvIeuvJmrUTUSwjVOh6hQh+0PAGTRrZ3WJOc eb4Rk+0ILBWGPSy58AEx4r1tkTsL2f0TVx4HRYHDN8wQ3xipDfOOYdnOn/JU65Qa yjHi47163kMjnruWV/GXIUA8xBV2c4Vc74agCQ8BOYIQWHegap4zgtsxZWC2WlML F1eJ/0seChwTaNZXY0Wy4YmtTBxEB7N7JKLO4mzQ9yOoQ0U+sAqOs3TAn0MOlcB5 H+RJhRL2sEZnrXMWD+MtT3Z62b2SR5acE8f9ZdH6O3lg1WZHzj106paBVAZjZZzK lrEy2X9N60b7zefN4EIo =815o -----END PGP SIGNATURE----- --VuQYccsttdhdIfIP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131215235150.GF1446>