From owner-freebsd-current@FreeBSD.ORG Fri Apr 20 20:36:19 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id A06B2106567F; Fri, 20 Apr 2012 20:36:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from [127.0.0.1] (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id C31E31A49FC; Fri, 20 Apr 2012 20:35:45 +0000 (UTC) Message-ID: <4F91C8A1.7060400@FreeBSD.org> Date: Fri, 20 Apr 2012 13:35:45 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: pfg@freebsd.org References: <1334945896.68082.YahooMailClassic@web113507.mail.gq1.yahoo.com> In-Reply-To: <1334945896.68082.YahooMailClassic@web113507.mail.gq1.yahoo.com> X-Enigmail-Version: 1.4 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org, jasone@freebsd.org Subject: Re: contrib/jemalloc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2012 20:36:19 -0000 On 04/20/2012 11:18 AM, Pedro Giffuni wrote: > FWIW, > > While the vendor branch is usually the cleanest way to merge > updates, it is not always the best. I personally gave up on > updating two packages from the vendor tree because it's just > too much trouble. With due respect, if doing it the right way is too difficult, the answer is to ask for help rather than giving up. There are plenty of us who are experienced with doing this, and would be glad to assist. In the CVS era I agree that vendor imports could be very difficult. But with svn it's much, much easier. > In this case it's likely that the committed > jemalloc is very FreeBSD specific and doesn't really match the > more generic version. That's true of most of our 3rd party products. We usually handle this with something like FREEBSD-Xlist, etc. Once again I put forward the FREEBSD-Upgrade file for BIND as an example. (And lest people think that I'm tooting only my own horn here, a lot of that work, especially the initial work for BIND 9, was done by des.) It's hard for me to see how Jason's multiple patching/diffing solution could be an improvement. Also, one advantage to doing a clean import into a vendor branch before merging into contrib is that with svn maintaining local differences in contrib/ is painless. In that way, whatever differences there are can be easily seen by people not as familiar with the code as Jason is. > INHO, being that the committer is also the author it is likely > his prerogative how to update it. I'm more interested in long term maintainability, as well as the historical value that having the clean vendor imports gives us. Doug