From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Adrien Mazarguil <adrien.mazarguil@6wind.com>,
Bruce Richardson <bruce.richardson@intel.com>
Cc: Thomas Monjalon <thomas@monjalon.net>,
stephen@networkplumber.org, dev@dpdk.org
Subject: Re: [dpdk-dev] git trees organization
Date: Wed, 13 Sep 2017 12:38:37 +0100 [thread overview]
Message-ID: <a7de54a6-7f59-6192-7d41-f2ed6ebb2339@intel.com> (raw)
In-Reply-To: <20170913075845.GR2481@6wind.com>
On 9/13/2017 8:58 AM, Adrien Mazarguil wrote:
> Hi,
>
> On Tue, Sep 12, 2017 at 09:32:07AM +0100, Bruce Richardson wrote:
>> On Tue, Sep 12, 2017 at 12:03:30AM +0200, Thomas Monjalon wrote:
>>> Hi all,
>>>
>>> As you know I am currently the only maintainer of the master tree.
>>> It is very convenient because I need to synchronize with others
>>> only when pulling "next-*" trees.
>>> But the drawback is that I should be available very often to
>>> avoid stalled patches waiting in patchwork backlog.
>>>
>>> I feel it is the good time to move to a slightly different organization.
>>> I am working closely with Ferruh Yigit for almost one year, as next-net
>>> maintainer, and I think it would be very efficient to delegate him some
>>> work for the master tree.
>>
>> I think Ferruh has been doing an excellent job on the net tree, and
>> would be an excellent candidate to help with the workload on the master
>> tree.
>>
>>> I mean that I would use the patchwork delegation to explicitly divide
>>> the workload given our different experiences.
>>> Ferruh, do you agree taking this new responsibility?
>>>
>>> At the same time, we can think how to add more git sub-trees:
>>
>> In principle, I'm in favour, but I think that the subtrees of the master
>> tree should be at a fairly coarse granularity, and not be too many of
>> them. The more subtrees, the more likely we are to have issues with
>> patchsets needing to be split across trees, or having to take bits from
>> multiple trees in order to test if everything is working.
> <snip>
>
> About that, how about we start allowing true merge commits instead of
> rebasing (rewriting history) in order to ease things for maintainers?
>
> This approach makes pull requests show up as a merge commits that contain
> the (ideally trivial) changes needed to resolve any conflicts; this has the
> following benefits:
>
> - The work done by a maintainer during that merge is tracked, not silently
> ignored or lost. The merge commit itself is signed-off by its author.
>
> - This allows tracing mistakes or bugs to the conflict resolution itself.
>
> - Upstream can reject pull requests on the basis that merging it is not
> trivial enough (i.e. downstream must merge upstream changes first).
>
> - Sub-trees can merge among themselves in case they need features that
> encompass several trees, not necessarily always against the master
> tree. Everything is tracked.
>
> - Maintainers do not ever modify the commits they get from other trees,
> which keep their SHAs unmodified as part of the history. A given commit ID
> is truly unique among all trees (back-port trees remain the only exception
> since commits are cherry-picked).
>
> - It shifts the entire responsibility to the maintainers of sub-trees.
>
> The only downside is that commits have several parents, history becomes a
> graph that developers need to get used to (some might call it a mess),
> however that's probably not an issue for those already used to Linux kernel
> development and other large projects.
>
> I know this was already discussed in the past, however I think adding more
> sub-trees will make rebasing too complex otherwise>
> Thoughts?
>
Using git merge looks more proper git usage, but I have one question /
concern:
For next-net, sometimes there are dependent patches in main tree, and
what I am doing is rebasing sub-tree on top of latest main tree.
When switched to merge method, how dependent patches can be get into the
sub-tree? Merge from main tree to sub-tree? Won't this bidirectional
merging confusing?
And following are notes from my current experience:
- Having re-writable history gives some flexibility to sub-trees.
Possible to update commit logs and amend patches even after pushed.
- It is hard to confirm pulled commits in main tree, I guess merge
commit will make this easier.
- To track main tree, continuously rebasing and continuously re-writing
history, I am doing this almost daily, this may be hard for people
working on top of next-net.
- Conflict resolving done by sub-trees during rebase, instead of done by
main tree during merge. So this may be more distributed effort.
- Rebasing gives more straight forward history in main repo, merge
commits looks more confusing, although I would expect it won't be as
complex as Linux tree, so may not be a problem.
Thanks,
ferruh
next prev parent reply other threads:[~2017-09-13 11:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 22:03 Thomas Monjalon
2017-09-12 8:32 ` Bruce Richardson
2017-09-12 8:48 ` Thomas Monjalon
2017-09-12 13:01 ` Wiles, Keith
2017-09-12 16:34 ` Ferruh Yigit
2017-09-13 7:58 ` Adrien Mazarguil
2017-09-13 11:38 ` Ferruh Yigit [this message]
2017-09-13 12:25 ` Adrien Mazarguil
2017-09-13 13:21 ` Ferruh Yigit
2017-09-13 14:54 ` Adrien Mazarguil
2017-09-14 2:25 ` Stephen Hemminger
2017-09-14 8:22 ` Thomas Monjalon
2017-09-14 9:03 ` Bruce Richardson
2017-09-14 9:18 ` Thomas Monjalon
2017-09-14 12:50 ` Wiles, Keith
2017-09-14 9:11 ` Nélio Laranjeiro
2017-09-14 17:57 ` Stephen Hemminger
2017-09-12 16:32 ` Ferruh Yigit
2017-09-12 20:20 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a7de54a6-7f59-6192-7d41-f2ed6ebb2339@intel.com \
--to=ferruh.yigit@intel.com \
--cc=adrien.mazarguil@6wind.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=stephen@networkplumber.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).