From owner-svn-src-all@FreeBSD.ORG Sun Jan 17 20:00:21 2010 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 BC5031065676; Sun, 17 Jan 2010 20:00:21 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (skuns.zoral.com.ua [91.193.166.194]) by mx1.freebsd.org (Postfix) with ESMTP id 482228FC16; Sun, 17 Jan 2010 20:00:20 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id o0HK0HA0009360 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 17 Jan 2010 22:00:17 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3) with ESMTP id o0HK0Hum043611; Sun, 17 Jan 2010 22:00:17 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3/Submit) id o0HK0HhD043610; Sun, 17 Jan 2010 22:00:17 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 17 Jan 2010 22:00:17 +0200 From: Kostik Belousov To: Christian Brueffer Message-ID: <20100117200017.GK62907@deviant.kiev.zoral.com.ua> References: <201001171817.o0HIH0Tl005741@svn.freebsd.org> <20100117195209.GI62907@deviant.kiev.zoral.com.ua> <20100117185821.GA1918@serenity> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="K511Q2pAJ3dpTMb/" Content-Disposition: inline In-Reply-To: <20100117185821.GA1918@serenity> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua 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-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: Sun, 17 Jan 2010 20:00:21 -0000 --K511Q2pAJ3dpTMb/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jan 17, 2010 at 07:58:22PM +0100, Christian Brueffer wrote: > 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_KERNELCON= FIG > > > +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEP= END > > > # -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 dept= h 1 ? >=20 > 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? I think yes. You should merge the whole tree and commit it as a whole, in such situation. Alternatively, it seems that most people do not see much harm in merging to the files at top level. --K511Q2pAJ3dpTMb/ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAktTbFAACgkQC3+MBN1Mb4jwoACgi6/zJ/pamTkCWdumKBhrQKEC WUgAoOt01ENE83GzyU5YP+G2jcVyH+oD =dQLz -----END PGP SIGNATURE----- --K511Q2pAJ3dpTMb/--