Date: Tue, 25 Feb 2014 16:18:45 -0500 From: Ed Maste <emaste@freebsd.org> To: David Chisnall <theraven@freebsd.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, Baptiste Daroussin <bapt@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, Peter Jeremy <peter@rulingia.com>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org> Subject: Re: 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... Message-ID: <CAPyFy2BYCU2Fo1PGCvg7S8EKVwfUDT5LgdnbxdBm3MZ_35reXQ@mail.gmail.com> In-Reply-To: <C71FDED4-CB40-45BC-BA97-4FB0BCB2CCB8@FreeBSD.org> References: <201402210726.s1L7QnBP007144@svn.freebsd.org> <20140222082350.GA2705@server.rulingia.com> <20140222121438.GO1699@ithaqua.etoilebsd.net> <20140225062222.GB2705@server.rulingia.com> <20140225075220.GF83610@ithaqua.etoilebsd.net> <C71FDED4-CB40-45BC-BA97-4FB0BCB2CCB8@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 25 February 2014 03:49, David Chisnall <theraven@freebsd.org> wrote: > > For the libc++ imports, we strip out the support directory, which contain= s Solaris and Win32-specific stuff. If we end up with a support/freebsd, t= hen we'll bring that in, but not support/solaris and support/win32. That s= tuff is in the vendor branch, but it just seems polite not to make people w= ho check out head get files that are never used when building FreeBSD in an= y 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 di= stribution in the vendor tree. So, import everything, but merge only what i= s 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2BYCU2Fo1PGCvg7S8EKVwfUDT5LgdnbxdBm3MZ_35reXQ>