From owner-freebsd-current@FreeBSD.ORG Sat Apr 21 21:20:07 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F0F901065675 for ; Sat, 21 Apr 2012 21:20:07 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm19-vm2.bullet.mail.ne1.yahoo.com (nm19-vm2.bullet.mail.ne1.yahoo.com [98.138.91.95]) by mx1.freebsd.org (Postfix) with SMTP id 8BAEB8FC15 for ; Sat, 21 Apr 2012 21:20:07 +0000 (UTC) Received: from [98.138.90.56] by nm19.bullet.mail.ne1.yahoo.com with NNFMP; 21 Apr 2012 21:20:01 -0000 Received: from [98.138.226.62] by tm9.bullet.mail.ne1.yahoo.com with NNFMP; 21 Apr 2012 21:20:01 -0000 Received: from [127.0.0.1] by smtp213.mail.ne1.yahoo.com with NNFMP; 21 Apr 2012 21:20:01 -0000 X-Yahoo-Newman-Id: 515851.48543.bm@smtp213.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: x4g1JY4VM1lVVyPuBJZ77gsEKEQ6WYhpCuNv1ifNeovivEQ wITa5eJ3C8FHnx.fq72_6WhZ.bXTyffSMYrQ0Pn69BHa4_r3EmDkLzT1wqqQ uKmE5i7y849FiRrQBWVZjSDvmiHbg9ABeIssfrSaHv5JN.McYarSR96.0Wvs fD09bljV.eqKz1qLMqByno48qo6Bv8jXhPjn0gHhMUTvNkwRSxS4wE2IBKHk mu5VfzmiU2FjxPh0T8Ldlf6MchiKU3soCl5zNQF8q6yHhlNsR3d5mRLlnvy. DkYrYdpTLJRIU77i4_bG4aBsUDZgTSBCd3MjNh7Oqg4io2YqxqNyu1fYhNRj gA9cy0ydOIONcYJFdYbXc2fgHsmPxeUAxYngFhWUmKq4eaJGg6p6QzvDOk0X Kka5bWHAjhz.rMoJmQj7e_8g_b591SPR9Evqr8.ifw7vlWrgTsuRHkP9kwD. nM7gKinDzHRnbQUdIvEpGU4FzmUAtsRsISCN9mORbOPCGYpGTObXH2.1Ko2y VzTyMXSKCkWoc95JC4E2qToE- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Received: from [192.168.10.103] (pfg@200.118.157.7 with plain) by smtp213.mail.ne1.yahoo.com with SMTP; 21 Apr 2012 14:20:01 -0700 PDT Message-ID: <4F93247E.4090905@FreeBSD.org> Date: Sat, 21 Apr 2012 16:19:58 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:10.0.3) Gecko/20120328 Thunderbird/10.0.3 MIME-Version: 1.0 To: Doug Barton References: <4F91C8A1.7060400@FreeBSD.org> <1334956412.79181.YahooMailClassic@web113504.mail.gq1.yahoo.com> <20120421003256.GB80419@dragon.NUXI.org> <4F920806.4040607@FreeBSD.org> <4F926054.4060903@FreeBSD.org> In-Reply-To: <4F926054.4060903@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@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: Sat, 21 Apr 2012 21:20:08 -0000 On 04/21/12 02:23, Doug Barton wrote: > ... >> In libedit we have incomplete merges from upstream (that was >> CVS fault), we have some changes that are obsolete wrt to how >> upstream solved the same issues and we have a couple of >> files that have diverged completely from upstream. > I agree that sounds like an ugly mess ... who is working on cleaning it > up? Is this something that we need to create a team to address? It > certainly sounds like something too large for one person to handle on > their own. I have a patch (pending approval) to improve things here: http://people.freebsd.org/~pfg/patches/patch-libedit-cvs20091228 and I will try to reduce some other differences with upstream code but I think at some point we will just have to do a brute merge from the code upstream. >> Either way it all can all be solved but it's just a lot of work and I >> can see how the direct approach helps understand better what >> is happening and can ultimately save time. > I'm glad we have an area of agreement. It sounds to me like the lesson > from libedit is to do it right from the very beginning, so that things > like libedit don't happen again. The libedit case shows a case where the vendor branch approach failed. To be quite honest, it all depends on the maintainer and not really on the mechanics: if no one cares to keep up with the small changes during a while, eventually someone has to take care of a bigger set of changes in the future. In jemalloc's case I am really glad to see the code updated and maintained now. Pedro.