Re: [gentoo-dev] Git braindump: 2 of N: developer interaction (merge co-ordinators)

[Thomas Sachau]

Robin H. Johnson schrieb:
> Developer Interaction model with Git
> ------------------------------------
> Aka, why merge lieutenants or co-ordinators might be useful
>
> This is amongst the potential problems I see might pop up.
>
> We have two developers, let's call them Alice & Bob.
>
> Alice has a nice fast internet connection, 10Mbit upstream.
> Bob has a really sucky internet connection, 128Kbit upstream.
>
> Alice is doing this set of commands, as she has a fast connection:
> - (work on an ebuild)
> - repoman commit
> - git pull (implicit merge)
> - git push
>
> Bob is doing this, as he has a slow intermittent connection
> - (work on an ebuild)
> - repoman commit
> - loop the above many times
> - git pull (implicit merge)
> - fix conflicts as needed
> - git push
>
> If there are enough "Alice" developers, is it a possibility that Bob
> will never have a chance to get his commit in?
>
> All this requires, is that in the time it takes Bob to do 'git pull',
> Alice manages to do 'git push' again.
>
> Alice can thus deprive Bob of a fair chance to get his commit in.
> Bob becomes an unhappy developer and gives up.
>
> Is this a realistic problem you ask? As recently as one or two years
> ago, we still have developers on 56K or worse modems at home.

I have a slow upstream connection myself and still dont see any issues
with the workflow of alice from your example. It might be worse for a
56K modem like connection, but from my experience with sunrise (where we
already use git and use the workflow of Alice with our commit tool),
128kbit upstream with a faster downstream should be ok.
My guess would be, that this is more an issue for people, who do work on
the tree while being offline and who then have to resolve the conflicts,
when they get a connection again.

-- 

Thomas Sachau
Gentoo Linux Developer