From owner-svn-src-stable@FreeBSD.ORG Sun Jan 17 20:11:02 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8EA91065676; Sun, 17 Jan 2010 20:11:02 +0000 (UTC) (envelope-from chris@brueffer.de) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by mx1.freebsd.org (Postfix) with ESMTP id 783188FC12; Sun, 17 Jan 2010 20:11:02 +0000 (UTC) Received: from brueffer.de (84-73-206-110.dclient.hispeed.ch [84.73.206.110]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MbtgI-1NFU5W3C90-00JRXr; Sun, 17 Jan 2010 20:58:25 +0100 Received: by brueffer.de (Postfix, from userid 1001) id 7616917040; Sun, 17 Jan 2010 19:58:22 +0100 (CET) Date: Sun, 17 Jan 2010 19:58:22 +0100 From: Christian Brueffer To: Kostik Belousov Message-ID: <20100117185821.GA1918@serenity> References: <201001171817.o0HIH0Tl005741@svn.freebsd.org> <20100117195209.GI62907@deviant.kiev.zoral.com.ua> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mP3DRpeJDSE+ciuQ" Content-Disposition: inline In-Reply-To: <20100117195209.GI62907@deviant.kiev.zoral.com.ua> X-Operating-System: FreeBSD 9.0-CURRENT X-PGP-Key: http://people.FreeBSD.org/~brueffer/brueffer.key.asc X-PGP-Fingerprint: A5C8 2099 19FF AACA F41B B29B 6C76 178C A0ED 982D User-Agent: Mutt/1.5.19 (2009-01-05) X-Provags-ID: V01U2FsdGVkX1+Rj2cKlV+Ha5M8HfKBOKTJeA/3ik9uGVYlrTY mYa2g4Mo3ECG5ut4Upt8l+I2shwQRxC0VDxpLRaz5YRadCRqQg 24IqHAA1xbIEheyNyDNPy6apZEHwnF3 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r202501 - stable/8 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2010 20:11:03 -0000 --mP3DRpeJDSE+ciuQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jan 17, 2010 at 09:52:09PM +0200, Kostik Belousov wrote: > On Sun, Jan 17, 2010 at 06:17:00PM +0000, Christian Brueffer wrote: > > Author: brueffer > > Date: Sun Jan 17 18:17:00 2010 > > New Revision: 202501 > > URL: http://svn.freebsd.org/changeset/base/202501 > >=20 > > Log: > > MFC: r197056 by des > > =20 > > Fix comment about KERNFAST. > > =20 > > PR: 142854 > > Submitted by: Nikolay Denev > >=20 > > Modified: > > stable/8/Makefile.inc1 > > Directory Properties: > > stable/8/ (props changed) > >=20 > > Modified: stable/8/Makefile.inc1 > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- stable/8/Makefile.inc1 Sun Jan 17 17:52:35 2010 (r202500) > > +++ stable/8/Makefile.inc1 Sun Jan 17 18:17:00 2010 (r202501) > > @@ -5,7 +5,7 @@ > > # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir > > # -DNO_CLEAN do not clean at all > > # -DNO_SHARE do not go into share subdir > > -# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG > > +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND > > # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel > > # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel > > # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel >=20 > Am I right that you did this merge on partial checkout, limited by depth = 1 ? Full checkout, but I did the merge with -depth empty to avoid propagating the mergeinfo down the subdirectories. Was that the wrong thing to do? - Christian --=20 Christian Brueffer chris@unixpages.org brueffer@FreeBSD.org GPG Key: http://people.freebsd.org/~brueffer/brueffer.key.asc GPG Fingerprint: A5C8 2099 19FF AACA F41B B29B 6C76 178C A0ED 982D --mP3DRpeJDSE+ciuQ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAktTXc0ACgkQbHYXjKDtmC2koQCaAlRA4vwEsSVzeZK9nG8BaPME J2AAoLnRc3NYNiQV5Syq/A8ZmDb6FiVL =gdZ4 -----END PGP SIGNATURE----- --mP3DRpeJDSE+ciuQ--