From owner-freebsd-current@FreeBSD.ORG Sat Apr 21 00:32:57 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 6D714106566B; Sat, 21 Apr 2012 00:32:57 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 481A38FC15; Sat, 21 Apr 2012 00:32:57 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.5/8.14.5) with ESMTP id q3L0WusX080475; Fri, 20 Apr 2012 17:32:57 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.5/8.14.5/Submit) id q3L0Wux0080474; Fri, 20 Apr 2012 17:32:56 -0700 (PDT) (envelope-from obrien) Date: Fri, 20 Apr 2012 17:32:56 -0700 From: "David O'Brien" To: Pedro Giffuni Message-ID: <20120421003256.GB80419@dragon.NUXI.org> Mail-Followup-To: obrien@freebsd.org, Pedro Giffuni , Doug Barton , freebsd-current@freebsd.org References: <4F91C8A1.7060400@FreeBSD.org> <1334956412.79181.YahooMailClassic@web113504.mail.gq1.yahoo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1334956412.79181.YahooMailClassic@web113504.mail.gq1.yahoo.com> X-Operating-System: FreeBSD 10.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Doug Barton , freebsd-current@freebsd.org Subject: Re: contrib/jemalloc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@freebsd.org 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 00:32:57 -0000 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). -- -- David (obrien@FreeBSD.org)