From owner-svn-src-all@FreeBSD.ORG Tue Feb 25 21:18:46 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC56796B; Tue, 25 Feb 2014 21:18:46 +0000 (UTC) Received: from mail-qc0-x231.google.com (mail-qc0-x231.google.com [IPv6:2607:f8b0:400d:c01::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 57F4E1AEE; Tue, 25 Feb 2014 21:18:46 +0000 (UTC) Received: by mail-qc0-f177.google.com with SMTP id m20so3023178qcx.36 for ; Tue, 25 Feb 2014 13:18:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=YV4HssKNAgwKCl9Dt+1ut2tpCu1eDK3YXNNxEW6Kr7o=; b=mZLSVg4dH4DHUnHt+lwHNtWIe0YCZIANAVxC5OLv0pgBD/LRZiyumGmcuxS3eyspnk qF9KUqkuzF8pTSTOwvqBYFgDOGdHPq+GCYBfQIy77gnhsUN+8xPdxIOfM4OG4+9+aqsN qb0xF0O6+I4cmR+VHb7TVF4dIQDMtl0lfy+f0eXhZQ+yeVAs6yWCQNc3Rdn4QSa7QyHi JEoP0qdN6tZ4Tn7hD0HG2apAPLZdZ1Ay6ffK4J9chCUlVo7o366RXtmIN9p+Fhvj0fXs L3aixt9pqIypIxdknj5G496qLjg9SUMT3po9zRx8JVuUdEkPqyW8YznN3Rtm7WhsbhX4 +Evg== MIME-Version: 1.0 X-Received: by 10.140.31.9 with SMTP id e9mr2998290qge.76.1393363125575; Tue, 25 Feb 2014 13:18:45 -0800 (PST) Sender: carpeddiem@gmail.com Received: by 10.140.31.68 with HTTP; Tue, 25 Feb 2014 13:18:45 -0800 (PST) In-Reply-To: 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> Date: Tue, 25 Feb 2014 16:18:45 -0500 X-Google-Sender-Auth: 2Ni6IdeCw2nqM8xQkrgUTSrr288 Message-ID: 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... From: Ed Maste To: David Chisnall Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: "svn-src-head@freebsd.org" , Baptiste Daroussin , "src-committers@freebsd.org" , Peter Jeremy , "svn-src-all@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 21:18:47 -0000 On 25 February 2014 03:49, David Chisnall 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.