Date: Sat, 30 Jul 2011 16:42:42 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: Andriy Gapon <avg@FreeBSD.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: r224490 - in stable/8/sys/dev/ata: . chipsets Message-ID: <4E341862.9000805@FreeBSD.org> In-Reply-To: <4E332CF8.6080002@FreeBSD.org> References: <201107290958.p6T9wum1042480@svn.freebsd.org> <4E332CF8.6080002@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2011-07-29 23:58, Andriy Gapon wrote: > Picking a random stable/8 sys commit: > > on 29/07/2011 12:58 Alexander Motin said the following: >> Modified: >> stable/8/sys/dev/ata/ata-pci.c >> stable/8/sys/dev/ata/ata-pci.h >> stable/8/sys/dev/ata/chipsets/ata-acard.c >> stable/8/sys/dev/ata/chipsets/ata-acerlabs.c >> stable/8/sys/dev/ata/chipsets/ata-intel.c >> stable/8/sys/dev/ata/chipsets/ata-promise.c >> Directory Properties: >> stable/8/sys/ (props changed) >> stable/8/sys/amd64/include/xen/ (props changed) >> stable/8/sys/cddl/contrib/opensolaris/ (props changed) >> stable/8/sys/contrib/dev/acpica/ (props changed) >> stable/8/sys/contrib/pf/ (props changed) >> stable/8/sys/geom/label/ (props changed) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > Why do we have this now? Because the merging instructions say: "Changes to kernel code should be merged to sys. For instance, a change to the ichwd(4) driver should be merged to sys, not sys/dev/ichwd. Likewise, a change to the TCP/IP stack should be merged to sys, not sys/netinet." So any merge from head to stable/x will also update the directories that already have svn:mergeinfo properties, namely those listed above.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E341862.9000805>