From owner-freebsd-current@FreeBSD.ORG Fri Apr 20 18:18:18 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 D52BA1065672 for ; Fri, 20 Apr 2012 18:18:18 +0000 (UTC) (envelope-from pfg@freebsd.org) Received: from nm20-vm0.bullet.mail.sp2.yahoo.com (nm20-vm0.bullet.mail.sp2.yahoo.com [98.139.91.218]) by mx1.freebsd.org (Postfix) with SMTP id 9134A8FC1B for ; Fri, 20 Apr 2012 18:18:18 +0000 (UTC) Received: from [98.139.91.63] by nm20.bullet.mail.sp2.yahoo.com with NNFMP; 20 Apr 2012 18:18:17 -0000 Received: from [98.139.91.47] by tm3.bullet.mail.sp2.yahoo.com with NNFMP; 20 Apr 2012 18:18:17 -0000 Received: from [127.0.0.1] by omp1047.mail.sp2.yahoo.com with NNFMP; 20 Apr 2012 18:18:17 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 431628.35891.bm@omp1047.mail.sp2.yahoo.com Received: (qmail 69407 invoked by uid 60001); 20 Apr 2012 18:18:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1334945896; bh=V52MPWFDSctPVZlbP/oBFb+o9zrTbYgZAVE9fbbZYRs=; h=X-YMail-OSG:Received:X-RocketYMMF:X-Mailer:Message-ID:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=hRly9oqTclGNZv5O2+MxgQSxjsXBAp9oEviMcAj+MkrROKDU4QoCkdN4XKqtj4ubTZrpyy1Mia6bM9fNaFEO2RkZpMkLx4EyLQ+jfmXMjaZU6lP5Smm7GBiSU83Q+aQi3u+6nwmnbcnAUzQuk+89Cr61M8Xf1wPXpn7ffP8kvcU= X-YMail-OSG: 0klEy5YVM1mQ_BTT4HBIB9pUBTIkTrnUtcLNR9pmXN3pJMa e0YUGXA9_DePn9l7GzGdvPan_3ZFaJoVEt7oc5PPOok5K6szuTRTc1F6yTj7 c4HzjfuIsxd0UCXbCZmm9tosKbqQKQaQVGP_3aUlb86qBeUChsqGqqfydHso bl3QWeMHrcfzUPxAcVErSPrJdtgTeI8xlgs03.kIyzW_SlLwopKoLUcVU7Ld 6QDqVlD1y2sTWe06rg6e8NWnc5ISFfzSgsaER_EP_3qjT_DSgUGUrkfQ3q3E IuAp6mLexPgzfK4vK9OkYI63M4XGHwe0iENdjDAIZy8MAW5C8FHeqEkcHWij by0C3LDfkmCz0OsNoP2hwZ.xHv7hDcgzMUopWkB9DzdUDz0YB_kptq2KvabO Z3FGp2.gQO.c_RjBiNf49YaAg_0_Hp37D8eM7J35x5leI9Uhi9itCzgEIylE mMpqw Received: from [200.118.157.7] by web113507.mail.gq1.yahoo.com via HTTP; Fri, 20 Apr 2012 11:18:16 PDT X-RocketYMMF: giffunip X-Mailer: YahooMailClassic/15.0.5 YahooMailWebService/0.8.117.340979 Message-ID: <1334945896.68082.YahooMailClassic@web113507.mail.gq1.yahoo.com> Date: Fri, 20 Apr 2012 11:18:16 -0700 (PDT) From: Pedro Giffuni To: jasone@freebsd.org, Doug Barton In-Reply-To: <4F919E11.6040807@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: contrib/jemalloc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: pfg@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: Fri, 20 Apr 2012 18:18:18 -0000 Hi;=0A=0A--- Ven 20/4/12, Doug Barton ha scritto:=0A...=0A> > =0A> > The wo= rkflow I'm using is documented in the patch=0A> (contrib/jemalloc/FREEBSD-u= pgrade).=A0 Can you tell me=0A> how to achieve a similarly streamlined impo= rt flow with a=0A> vendor branch in the mix?=A0 Also, what history would a= =0A> vendor branch preserve that this workflow does not?=A0=0A> The only up= side to vendor branch merges I can think of is=0A> that if any jemalloc sou= rces were manually modified between=0A> imports, merging would fail rather = than silently overwriting=0A> the changes.=A0 However, this presumes that c= hanges=0A> aren't making it upstream.=0A> =0A> I attempted to engage you ab= out this on the svn list and=0A> apparently you ignored my message. David i= s right, what=0A> you're doing is not even close to our normal work flow.= =0A> It would actually be easier for you (and those=0A> who may be maintain= ing this after you're gone) for you to do=0A> things the way that we normal= ly do them.=0A>=0A=0AFWIW,=0A=0AWhile the vendor branch is usually the clea= nest way to merge=0Aupdates, it is not always the best. I personally gave u= p on=0Aupdating two packages from the vendor tree because it's just=0Atoo m= uch trouble. In this case it's likely that the committed=0Ajemalloc is very= FreeBSD specific and doesn't really match the=0Amore generic version.=0A= =0AINHO, being that the committer is also the author it is likely=0Ahis pre= rogative how to update it.=0A=0Acheers,=0A=0APedro. =0A