svn commit: r262282 - in head: contrib/dma contrib/dma/debian contrib/dma/debian/migrate contrib/dma/debian/source contrib/dma/test etc/mtree libexec libexec/dma share/mk tools/build/mk tools/build...

Ed Maste emaste at freebsd.org
Tue Feb 25 21:18:47 UTC 2014


On 25 February 2014 03:49, David Chisnall <theraven at freebsd.org> wrote:
>
> For the libc++ imports, we strip out the support directory, which contains Solaris and Win32-specific stuff.  If we end up with a support/freebsd, then we'll bring that in, but not support/solaris and support/win32.  That stuff is in the vendor branch, but it just seems polite not to make people who check out head get files that are never used when building FreeBSD in any configuration.

And, this is the process documented in the subversion primer in the
committers guide:

>> Unlike in CVS where only the needed parts were imported into the vendor tree to avoid bloating the main tree, Subversion is able to store a full distribution in the vendor tree. So, import everything, but merge only what is required.

We should probably drop the "Unlike in CVS" bit, as differences vs.
the process used in 2008 become increasingly less relevant.  Some
additional advice or examples on how to "merge only what is required"
will be useful too -- for instance, identifying and excluding files
added since the last vendor import that are not desired in HEAD.

That said, for the LLDB imports to date I stripped the tree before the
import to vendor/.  When I do another import after the current work is
merged to HEAD I'll import everything in vendor/, and take notes as I
do the merge to HEAD in order to update the committer's guide.


More information about the svn-src-head mailing list