From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Wiles, Keith" Subject: Re: git trees organization Date: Thu, 14 Sep 2017 12:50:38 +0000 Message-ID: References: <2737351.pD9poAUtZC@xps> <5858182.HmkBWfGZLK@xps> <20170914090349.GA50056@bricha3-MOBL3.ger.corp.intel.com> <5035401.hoKbokARAT@xps> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc: "Richardson, Bruce" , Stephen Hemminger , Adrien Mazarguil , "Yigit, Ferruh" , "dev@dpdk.org" , "techboard@dpdk.org" To: Thomas Monjalon Return-path: In-Reply-To: <5035401.hoKbokARAT@xps> Content-Language: en-US Content-ID: <759CB47CF527B242B41E292253E58DE6@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > On Sep 14, 2017, at 4:18 AM, Thomas Monjalon wrote: >=20 > 14/09/2017 11:03, Bruce Richardson: >> On Thu, Sep 14, 2017 at 10:22:23AM +0200, Thomas Monjalon wrote: >>> 14/09/2017 04:25, Stephen Hemminger: >>>> Bisecting a tree with lots of subtree merges is terrible. That is why = Linus >>>> rebases and doesn't directly take linux-next >>>=20 >>> I agree, bisecting with subtree merges is not pleasant at all. >>> That's why I chose the rebase method until now. >>>=20 >>> Adrien mentioned some drawbacks with the rebase method. >>> Ferruh mentioned some drawbacks and some advantages of rebase. >>> Stephen mentioned another advantage of rebase. >>> Such decisions are really difficult. >>> One thing is sure: there will be always someone unhappy, >>> no matter the decision :) >>>=20 >>> When we want to take such decision or re-consider it, >>> we ask the techboard to vote... >>=20 >> I'm not sure the techboard needs to vote on this, this is an issue for >> the tree maintainers/committers is it not? If you do want techboard >> input on this, I suggest the committers come to an agreement among >> themselves, with community input, and then just look for tech board to >> ratify it. >=20 > No, it is an issue for everybody. > Rebase makes tracking of subtrees difficult for developpers. > Merge makes reading and bisecting difficult for developpers. > We cannot have an agreement in the community because both arguments > are valid. It seems to me the lesser of the two evils is rebase, but I have not used b= isect much. I would think we pick rebase and see how it goes as I know merg= ing can be a bit of a problem. We can always pick merge later if we find a = specific issue we need to fix or bisect. I know it is not ideal, but we nee= d to pick one and move on. >=20 > I add that merge can slow down subtree integration if a change is needed. > From my point of view, it is OK as it is currently. >=20 > It is maybe as difficult as choosing between vim and emacs ;) > (although it seems crazy to use emacs) What Emacs does everything for you even writes your code for you, that is w= hy I use vim and visual studio code to write my programs just so I feel use= ful and not replaced by Emacs :-) Regards, Keith