From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: git trees organization Date: Thu, 14 Sep 2017 10:57:05 -0700 Message-ID: <20170914105705.584662e5@plumbers-lap.home.lan> References: <2737351.pD9poAUtZC@xps> <20170913145402.GA2481@6wind.com> <5858182.HmkBWfGZLK@xps> <20170914091156.GB2160@autoinstall.dev.6wind.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: Thomas Monjalon , Adrien Mazarguil , Ferruh Yigit , Bruce Richardson , dev@dpdk.org, techboard@dpdk.org To: =?UTF-8?B?TsOpbGlv?= Laranjeiro Return-path: Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by dpdk.org (Postfix) with ESMTP id EA615199B3 for ; Thu, 14 Sep 2017 19:57:08 +0200 (CEST) Received: by mail-pf0-f178.google.com with SMTP id g65so50328pfe.13 for ; Thu, 14 Sep 2017 10:57:08 -0700 (PDT) In-Reply-To: <20170914091156.GB2160@autoinstall.dev.6wind.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 Thu, 14 Sep 2017 11:11:56 +0200 N=C3=A9lio Laranjeiro wrote: > On Thu, Sep 14, 2017 at 10:22:23AM +0200, Thomas Monjalon wrote: > > 14/09/2017 04:25, Stephen Hemminger: =20 > > > Bisecting a tree with lots of subtree merges is terrible. That is why= Linus > > > rebases and doesn't directly take linux-next =20 > >=20 > > I agree, bisecting with subtree merges is not pleasant at all. > > That's why I chose the rebase method until now. =20 >=20 > I don't see what is un-pleasant, if we start a bisect what we expect is to > find the commit introducing the issue, bisect is able to do it even on la= rge > tree with a lot of merges. Moreover, the probability the issue will be > searched in a specific section within its own subtree is high which also = means > locally it will be linear, is not it equivalent to the actual situation? >=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 A recent git bisect gives an example of the problem. I needed to bisect between two daily versions of linux-next. Linux-next is intentionally not a serial tree, it is recreated every day. The big bisect wanted to go through 10,000 commits and back track from 4.14-rc1 into 4.13-rc5 to get down into some subtree.=20 On upstream tree it nevers goes back into ancient history.