git workflow draft

[Jeremy Whiting]

I forgot to mention some details about my proposal. See below.

On Wed, Aug 31, 2011 at 9:07 AM, Jeremy Whiting <jpwhiting at kde.org> wrote:

> Ok it seems most people with a preference prefer KDE/X.Y over X.Y and for
> valid reasons
> 1) Other non-kde blessed branches can have obvious names.
> 2) Kdelibs, base, etc. are already KDE/X.Y
> 3) More modules are already KDE/X.Y than X.Y so less to fix when enforcing
> consistency. (after looking at which repos would need to change, I'm not so
> sure about this one...)
>
>
Part of the problem with some repositories using X.Y branch naming and
others using KDE/X.Y is that scripts and people that work with our
repositories need to know which ones use which scheme.

My proposal to rename the branches is this.  I (or someone else with access
to each repository) would checkout X.Y branch as KDE/X.Y then push it back
to the repository.  Then the old X.Y branches on the repository would be
removed.  This makes all the branches that are part of KDE SC follow the
consistent KDE/X.Y naming.  Any existing clones with tracking branches to
X.Y named branches would then not be updated unfortunately.  Which is the
reason for the announcement, posting the decision on techbase, including
instructions for updating tracking branches and so on.

In most cases, anyone with a clone without tracking branches will need to do
this:
git remote update
git remote prune origin (or whatever they named the remote)

In cases where tracking branches to X.Y branches are created, they will need
to be recreated to track KDE/X.Y instead.

I hope this clarifies my proposal a bit.  Feel free to ask any questions.

Jeremy

Thus I propose we agree to use KDE/X.Y for official kde release branches
> going forward and after tagging tomorrow put a notice on relevant mailing
> lists and on techbase.  Then one week later perform the required changes to
> existing repositories.
> 1 kdegraphics
> 2 kdeedu
> 3 kdeutils
> 4 kdepim
> 5 kdepim-runtime
> 6 kdeplasma-addons
> 7 kdepimlibs
>
> If I've missed any in the above list, please add them.


> best regards,
> Jeremy
>
>
> On Wed, Aug 31, 2011 at 5:00 AM, Sebastian Kügler <sebas at kde.org> wrote:
>
>> On Friday, August 26, 2011 12:06:26 Stephen Kelly wrote:
>> > >> Was this decided upon at some point?  I got conflicting stories from
>> > >> sysadmin and other developers.  Yesterday after migrating
>> > >> kdeaccessibility to git I was asked by a sysadmin to rename the X.Y
>> > >> branches to KDE/X.Y  I think concensus and consistency are important
>> > >> here.  Was there a decision that the official branches should be
>> named
>> > >> X.Y?
>> > >
>> > > My vote goes to "KDE/X.Y", it is clearer what it means.
>> >
>> > When the frameworks get split out into multiple repos, will they still
>> use
>> > branch names KDE/5.0? What will that mean? Or will we come up with
>> another
>> > scheme then?
>>
>> I think they should, here's my reasoning:
>>
>> The KDE part of the branch name means it's our "official" branch, i.e.
>> it's
>> done by KDE (not by individuals acting on their own), so basically our
>> official namespace. We use $name/feature elsewhere, and I think KDE/5.37
>> would
>> blend in nicely here. On top of that, it gives some continuity.
>>
>> Cheers,
>> --
>> sebas
>>
>> http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110831/a4f4845f/attachment.htm>