svn commit: r202501 - stable/8

[Christian Brueffer]

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
> > 
> > Log:
> >   MFC: r197056 by des
> >   
> >   Fix comment about KERNFAST.
> >   
> >   PR:             142854
> >   Submitted by:   Nikolay Denev <ndenev at gmail.com>
> > 
> > Modified:
> >   stable/8/Makefile.inc1
> > Directory Properties:
> >   stable/8/   (props changed)
> > 
> > Modified: stable/8/Makefile.inc1
> > ==============================================================================
> > --- 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
> 
> 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

-- 
Christian Brueffer	chris at unixpages.org	brueffer at FreeBSD.org
GPG Key:	 http://people.freebsd.org/~brueffer/brueffer.key.asc
GPG Fingerprint: A5C8 2099 19FF AACA F41B  B29B 6C76 178C A0ED 982D
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-stable-8/attachments/20100117/fb3ceb04/attachment.pgp