[Kde-scm-interest] Git roadmap

[Thiago Macieira]

Johannes Sixt wrote:
>Paolo Capriotti schrieb:
>> On Tuesday 18 September 2007 10:58:24 Johannes Sixt wrote:
>>> [snip]
>>>
>>> I propose to arrange that public pushes cannot advance other people's
>>> branches. For example, in kate/public/kdebase.git, I (j6t) can only
>>> push to branches whose names begin with j6t/:
>>>
>>> git push git://git.kde.org/kate/public/kdebase.git \
>>>               indent-fix:j6t/indent-fix
>>>
>>> This way I cannot overwrite (accidentally or deliberately) other
>>> people's changes.
>>
>> So what's the point in having a public set of repository when people
>> could just push their changes into the master repository in branches
>> beginning with its name?
>
>It's just an organizational arrangement, nothing technical. Just as you
> have a global master of KDE that is unencumbered of arbitrarily many
> user branches, there also is an application specific master that is
> clean of any user branches - it's meant as the official "next version"
> of an application.
>
>You can also view the public repositories as playground. Let everyone
> and his dog push to them, and the "lieutenants" pick the cherries from
> there.

Agreed. The public/free for all repositories will have an enormous amount 
of branches.

But I am not sure it fits exactly our culture if we restrict each person 
to his own branches.

KDE development right now means we push our changes to everyone. What 
Johannes is suggesting is that each person publishes his changes and then 
other people pull and merge those changes into their own branches.

Taking a concrete example: dashbot reported a few days ago that 
extragear/libs/libksane wasn't compiling because it was using 
variable-length arrays. I thought it was an easy fix, so I went ahead and 
replaced all uses with QVarLengthArray. Then I pushed my fixes (git svn 
dcommit, actually).

If I were confined to a branch called thiago/something, dashbot would not 
see my fix and would keep on complaining until the libksane maintainer 
merged my fixes. Thankfully he's active, but what if he had just gone on 
vacations for two weeks? Should I wait three days and then escalate to 
the extragear-libs maintainer?

That's why I think everyone should have access to "master" on the public 
repository and other "public" branches.

-- 
  Thiago Macieira  -  thiago (AT) macieira.info - thiago (AT) kde.org
    PGP/GPG: 0x6EF45358; fingerprint:
    E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20070918/6a941b4a/attachment.pgp