From owner-svn-src-all@FreeBSD.ORG Sat Aug 6 06:07:35 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F6DF106566C; Sat, 6 Aug 2011 06:07:35 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from mx0.hoeg.nl (mx0.hoeg.nl [IPv6:2a01:4f8:101:5343::aa]) by mx1.freebsd.org (Postfix) with ESMTP id 3D1E38FC08; Sat, 6 Aug 2011 06:07:35 +0000 (UTC) Received: by mx0.hoeg.nl (Postfix, from userid 1000) id 795032A28C30; Sat, 6 Aug 2011 08:07:34 +0200 (CEST) Date: Sat, 6 Aug 2011 08:07:34 +0200 From: Ed Schouten To: Doug Barton Message-ID: <20110806060734.GB1767@hoeg.nl> References: <201108051733.p75HXCrZ015026@svn.freebsd.org> <4E3C85DC.8070104@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Md/poaVZ8hnGTzuv" Content-Disposition: inline In-Reply-To: <4E3C85DC.8070104@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-all@freebsd.org, FreeBSD Current , re@FreeBSD.org Subject: Re: svn commit: r224659 - head/etc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2011 06:07:35 -0000 --Md/poaVZ8hnGTzuv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Doug, * Doug Barton , 20110806 02:07: > The other issue is that due to the way that mergemaster works by default > users who have existing /etc/nsswitch.conf files (which should be pretty > close to 100%) won't see this change because it doesn't affect the > $FreeBSD$ tag. If we decide to keep things this way then I would suggest > adding a comment to that file so that it will get picked up. You can work around this by doing a forced commit with SVN: - Add some whitespace to the file - Run svn commit - Remove the whitespace while the editor is open This will bump the $FreeBSD$ without changing its file contents. > However, I would much rather see us actually change the default file. > Users who are going to enable nis will already know that this file needs > to be tweaked, and by using more sensible defaults we'll be more > relevant to the majority of our userbase. So I propose the attached > (along with reverting your change obviously). I'm fine either way. Feel free to commit it (after re approval). :-) --=20 Ed Schouten WWW: http://80386.nl/ --Md/poaVZ8hnGTzuv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iQIcBAEBAgAGBQJOPNomAAoJEG5e2P40kaK7wZMP/ixxFC0nKXfrcc4HByCC5rzQ 0lAUBHs/Orq6ECLhae9t9Rp2MZVqrykmXV1wCak7tDhH8tHp063YKW+Hac4lo2hw la4vhH/e3ZcOBm/NN+1Wg/XPwfV9cLRNF3f+zX7UWmGKLPV0Zi13rxJiAfqgXUHX PnGNEgvpDBPsDobuWFbK/lrUgtaVAycOa3rPfDt5j/IjP97Tzw7Vv4UimqcsJMrc Z2r2uPU6TTFClOxxXdoEjPy4qkRUP7gv8R88yms8fcZxeNS+jYHdcalpwQN5lpC3 9EetaW/MYTfISoPAN1k0yobZBpJ2cbqzrTuyzBYFICXBfBGbAmvfJbsqV84bSKBJ I/kLWUpa5m3PxO7y46jYOCw/VVSn+krPZC0BULWarMrbkZo9NabXz7VhLEb21Fs0 qGnONgibDiY5Xkbk1KQH7eB1cltgm22gTFDUmjR1AAa/rSBXJRsSZgFOwtBMYIYb S5J1xkYTQ6eMy74i3fTa1jVlot5YsyIqc4Y1YzK8XKwba6l/G+3s8LCxDUTxtKYn ACJoAPDG882w6JowqeJxGfk5+c1dRj+5TvMtH2YC2peHyMhQ6hgBRYC6aKLFalob ZonrCTd08Y6o+Bp35E7WSR6E6bSQaE74Ep8d/40pOq6NrNUjnyrGyKKnhsg6U/5V x2LrM2IBNetfe/G13DyD =WQ59 -----END PGP SIGNATURE----- --Md/poaVZ8hnGTzuv--