Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Jan 2010 22:00:17 +0200
From:      Kostik Belousov <kostikbel@gmail.com>
To:        Christian Brueffer <chris@unixpages.org>
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
Message-ID:  <20100117200017.GK62907@deviant.kiev.zoral.com.ua>
In-Reply-To: <20100117185821.GA1918@serenity>
References:  <201001171817.o0HIH0Tl005741@svn.freebsd.org> <20100117195209.GI62907@deviant.kiev.zoral.com.ua> <20100117185821.GA1918@serenity>

next in thread | previous in thread | raw e-mail | index | archive | help

--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 <ndenev@gmail.com>
> > >=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/--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100117200017.GK62907>