From owner-freebsd-current@FreeBSD.ORG Sat Apr 21 01:06:24 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07998106566C for ; Sat, 21 Apr 2012 01:06:24 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm13-vm3.bullet.mail.ne1.yahoo.com (nm13-vm3.bullet.mail.ne1.yahoo.com [98.138.91.143]) by mx1.freebsd.org (Postfix) with SMTP id A2C0F8FC18 for ; Sat, 21 Apr 2012 01:06:23 +0000 (UTC) Received: from [98.138.90.54] by nm13.bullet.mail.ne1.yahoo.com with NNFMP; 21 Apr 2012 01:06:17 -0000 Received: from [98.138.226.128] by tm7.bullet.mail.ne1.yahoo.com with NNFMP; 21 Apr 2012 01:06:17 -0000 Received: from [127.0.0.1] by smtp215.mail.ne1.yahoo.com with NNFMP; 21 Apr 2012 01:06:17 -0000 X-Yahoo-Newman-Id: 119756.92413.bm@smtp215.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: ub46vlYVM1nnSQoAfHW48b1WkUu_iIVGJZVtt8Mdqb4PZAC FRIS81OGQzfz10bvgNJ66WFB9sK0c0vsYKBc74IHMWKCCTAZpqQp5xPwK53g S3p4VvKTq8gkQ1LM_P2py320XX3AJq8HnWEhftjUvzFgrLMgZLqpBaD7Xkzb H63gIjV7d8BZFVUJ34UgRTMs94TeqjK.W.3ZnvMSZmqiRv6bT6MR1RO9sJD4 M29a93hTcDEwmKZuFUfcl5jWn01JMl7n00h.AfdRfJ9gcjRa9GcKI2dO48bL 9lRtZ6bTWFYhKYF5oxRO3Fdt0izJ3euDAf3dD65gz5VemVpqVXVOs_KPVIbD bWogk0Vt1o17C8KDPb7rK.at.EBAx8lF1ojb.R9pcTygWVDmIuJQ6u06bf2v Pt1RAQlI5hf22tFd8HB0EgBlzwqc- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Received: from [192.168.10.103] (pfg@200.118.157.7 with plain) by smtp215.mail.ne1.yahoo.com with SMTP; 20 Apr 2012 18:06:16 -0700 PDT Message-ID: <4F920806.4040607@FreeBSD.org> Date: Fri, 20 Apr 2012 20:06:14 -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: obrien@freebsd.org, Doug Barton , freebsd-current@freebsd.org References: <4F91C8A1.7060400@FreeBSD.org> <1334956412.79181.YahooMailClassic@web113504.mail.gq1.yahoo.com> <20120421003256.GB80419@dragon.NUXI.org> In-Reply-To: <20120421003256.GB80419@dragon.NUXI.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: 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 01:06:24 -0000 On 04/20/12 19:32, David O'Brien wrote: > On Fri, Apr 20, 2012 at 02:13:32PM -0700, Pedro Giffuni wrote: >> Easier said than done. Feel free to give libedit a try. > That has nothing to do with our process and everything to do with us > blindly hacking away pissing all over to be our own thing -- BUT still > wanting to take work from the original author. > > I fail to see how not updating thru $FBSDrepo/vendor/NetBSD/libedit > is easier than updating thru it. > > Either way you have to figure out what to do with our great divergance. > At least when using the vendor branch you can use a good 3-way diff merge > tool (e.g. svn). > Usually the vendor upgrade approach works just fine if we do the periodic work of keeping up to date and we are careful to submit our changes upstream. The issue is that you really have to be in sync with one upstream version so that the changes you merge from the vendor branch are consistent. 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. 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. Pedro.