Re: Proposal for branching policy towards KF5

2013-07-29 Thread Aurélien Gâteau
Le mercredi 24 juillet 2013 23:05:55 Michael Pyne a écrit : On Fri, July 19, 2013 00:21:21 you wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : - the development branch for their next

Re: Proposal for branching policy towards KF5

2013-07-29 Thread Michael Pyne
On Mon, July 29, 2013 22:09:38 Aurélien Gâteau wrote: Le mercredi 24 juillet 2013 23:05:55 Michael Pyne a écrit : I didn't want to write another parser, but JSON has no native comment support, so the documentation [1] is on community.kde.org (though perhaps that's for the best). Slightly

Re: Proposal for branching policy towards KF5

2013-07-28 Thread Torgny Nyblom
On Friday 26 July 2013 23.53.07 Michael Pyne wrote: On Fri, July 26, 2013 21:11:21 Torgny Nyblom wrote: On Thursday 25 July 2013 18.24.50 Michael Pyne wrote: The 'logical module groups' might play a role in the release process after a release is done, but shouldn't have any further

Re: Proposal for branching policy towards KF5

2013-07-28 Thread Albert Astals Cid
El Diumenge, 28 de juliol de 2013, a les 11:33:58, Torgny Nyblom va escriure: On Friday 26 July 2013 23.53.07 Michael Pyne wrote: On Fri, July 26, 2013 21:11:21 Torgny Nyblom wrote: On Thursday 25 July 2013 18.24.50 Michael Pyne wrote: The 'logical module groups' might play a role in the

Re: Proposal for branching policy towards KF5

2013-07-26 Thread Torgny Nyblom
On Thursday 25 July 2013 18.24.50 Michael Pyne wrote: On Thu, July 25, 2013 22:44:47 Albert Astals Cid wrote: El Dimecres, 24 de juliol de 2013, a les 23:05:55, Michael Pyne va escriure: On Fri, July 19, 2013 00:21:21 you wrote: After more live discussion with Sebas and Marco plus Aaron

Re: Proposal for branching policy towards KF5

2013-07-26 Thread Michael Pyne
On Fri, July 26, 2013 21:11:21 Torgny Nyblom wrote: On Thursday 25 July 2013 18.24.50 Michael Pyne wrote: The 'logical module groups' might play a role in the release process after a release is done, but shouldn't have any further role for tagging that I can see. i18n is covered above.

Re: Proposal for branching policy towards KF5

2013-07-25 Thread David Faure
On Wednesday 24 July 2013 10:23:46 Michael Pyne wrote: On Tue, July 23, 2013 14:20:39 David Faure wrote: On Saturday 20 July 2013 23:04:10 Michael Pyne wrote: This is a labor-intensive task, but it's easy to centrally-manage without having to rely on many different module maintainers

Re: Proposal for branching policy towards KF5

2013-07-25 Thread Albert Astals Cid
El Dimecres, 24 de juliol de 2013, a les 23:05:55, Michael Pyne va escriure: On Fri, July 19, 2013 00:21:21 you wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : - the development branch

Re: Proposal for branching policy towards KF5

2013-07-25 Thread Michael Pyne
On Thu, July 25, 2013 22:44:47 Albert Astals Cid wrote: El Dimecres, 24 de juliol de 2013, a les 23:05:55, Michael Pyne va escriure: On Fri, July 19, 2013 00:21:21 you wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup

Re: Proposal for branching policy towards KF5

2013-07-24 Thread Michael Pyne
On Fri, July 19, 2013 00:21:21 you wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : - the development branch for their next feature release (based on Qt5/KF5) will be master. - *before*

Re: Proposal for branching policy towards KF5

2013-07-21 Thread Thomas Lübking
On Sonntag, 21. Juli 2013 05:04:10 CEST, Michael Pyne wrote: On Fri, July 19, 2013 00:21:21 David Faure wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : Adding a similar generic selection for

Re: Proposal for branching policy towards KF5

2013-07-21 Thread Ben Cooksley
On Sun, Jul 21, 2013 at 9:13 PM, Thomas Lübking thomas.luebk...@gmail.com wrote: On Sonntag, 21. Juli 2013 05:04:10 CEST, Michael Pyne wrote: On Fri, July 19, 2013 00:21:21 David Faure wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the

Re: Proposal for branching policy towards KF5

2013-07-21 Thread Thomas Lübking
On Sonntag, 21. Juli 2013 11:15:29 CEST, Ben Cooksley wrote: On Sun, Jul 21, 2013 at 9:13 PM, Thomas Lübking thomas.luebk...@gmail.com wrote: On Sonntag, 21. Juli 2013 05:04:10 CEST, Michael Pyne wrote: On Fri, July 19, 2013 00:21:21 David Faure wrote: ... git symbolic-ref refs/heads/NEXT

Re: Proposal for branching policy towards KF5

2013-07-21 Thread Ben Cooksley
On Sun, Jul 21, 2013 at 9:54 PM, Thomas Lübking thomas.luebk...@gmail.com wrote: On Sonntag, 21. Juli 2013 11:15:29 CEST, Ben Cooksley wrote: On Sun, Jul 21, 2013 at 9:13 PM, Thomas Lübking thomas.luebk...@gmail.com wrote: On Sonntag, 21. Juli 2013 05:04:10 CEST, Michael Pyne wrote: On

Re: Proposal for branching policy towards KF5

2013-07-21 Thread Sebastian Kügler
On Saturday, July 20, 2013 10:10:11 David Faure wrote: On Saturday 20 July 2013 13:28:47 Ben Cooksley wrote: I'd also be inclined to think of kde-runtime as part of kdelibs, rather than the workspace Yes, that is very true. Especially since the plan for most of kde-runtime is to fold it

Re: Proposal for branching policy towards KF5

2013-07-20 Thread Michael Pyne
On Fri, July 19, 2013 00:21:21 David Faure wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : Adding a similar generic selection for qt5/kf5, we would end up giving 3 options to people who

Re: Proposal for branching policy towards KF5

2013-07-19 Thread Martin Graesslin
On Friday 19 July 2013 01:39:47 Michael Jansen wrote: On Friday, July 19, 2013 12:21:21 AM David Faure wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : - the development branch for their

Re: Proposal for branching policy towards KF5

2013-07-19 Thread Aaron J. Seigo
On Friday, July 19, 2013 01:39:47 Michael Jansen wrote: I would like to mention that this is only a solution for scripts. It does not keep consistency for humans and all scripts outside of kde. And consistency is normally only needed for humans. As Martin noted, it’s not possible to keep every

Re: Proposal for branching policy towards KF5

2013-07-19 Thread Sebastian Kügler
On Friday, July 19, 2013 00:21:21 David Faure wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : [...] (*) kde-workspace, plasma-frameworks, please complete this list if there are more. The

Re: Proposal for branching policy towards KF5

2013-07-19 Thread Lamarque V. Souza
On Friday 19 July 2013 17:42:14 Sebastian Kügler wrote: On Friday, July 19, 2013 00:21:21 David Faure wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : [...] (*) kde-workspace,

Re: Proposal for branching policy towards KF5

2013-07-19 Thread Ben Cooksley
On Sat, Jul 20, 2013 at 3:42 AM, Sebastian Kügler se...@kde.org wrote: On Friday, July 19, 2013 00:21:21 David Faure wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : [...] (*) kde-workspace,

Proposal for branching policy towards KF5

2013-07-18 Thread Sebastian Kügler
Hi all, especially workspace and frameworks hackers, Based on our earlier discussion, I'd like to propose the following strategy as a general way to move kde-workspace and related modules (such as kdeplasma- adddons, etc.) to KF5 gradually: - master stays on 4.11, receives bugfixes, our

Re: Proposal for branching policy towards KF5

2013-07-18 Thread Martin Graesslin
On Thursday 18 July 2013 10:26:06 Sebastian Kügler wrote: - master stays on 4.11, receives bugfixes, our releases are based on this branch and their version number will stay 4.11 how do we prevent that people commit features into master? I would prefer if we lock down master in gitolite so

Re: Proposal for branching policy towards KF5

2013-07-18 Thread Luca Beltrame
Martin Graesslin wrote: how do we prevent that people commit features into master? I would prefer To be honest, I haven't really seen people commit features into kdelibs, and that's been frozen for a while. -- Luca Beltrame - KDE Forums team KDE Science supporter GPG key ID: 6E1A4E79

Re: Proposal for branching policy towards KF5

2013-07-18 Thread David Faure
After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : - the development branch for their next feature release (based on Qt5/KF5) will be master. - *before* this happens, however, kdesrc-build /

Re: Proposal for branching policy towards KF5

2013-07-18 Thread Michael Jansen
On Friday, July 19, 2013 12:21:21 AM David Faure wrote: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : - the development branch for their next feature release (based on Qt5/KF5) will be master.

Re: Proposal for branching policy towards KF5

2013-07-18 Thread Albert Astals Cid
El Divendres, 19 de juliol de 2013, a les 00:21:21, David Faure va escriure: After more live discussion with Sebas and Marco plus Aaron over a video chat, we came up with the following setup for the workspace repos (*) : - the development branch for their next feature release (based on