On Diumenge 07 Agost 2011 12:45:12 Stephen Kelly wrote: > David Faure wrote: > > On Tuesday 07 June 2011 01:43:44 David Faure wrote: > >> Once the 4.7 branch is created, the plan is to do the following: > >> > >> - application developers can work in master as usual, no change there. > >> > >> - we create a new branch in kdelibs (say, "frameworks") for the work on > >> splitting up kdelibs and reworking dependencies. Initially, this work is > >> based on Qt 4. We don't need Qt 5 to reorganize our own code. > >> > >> - kdelibs in master is frozen. No work going on there. > >> > >> At most, "merging" the fixes from 4.7 branch. > >> (No git bikeshedding please, when I say merging it can be either > >> merge or > >> > >> cherry-pick, I don't care) The idea here is: people who are used to "get > >> everything from master" can keep doing that, without hitting the > >> lib-splitting breakage. But at the same time, we don't really want to > >> apply bugfixes to three branches (4.7, master, frameworks). At least I'm > >> too lazy for that, I think two branches is plenty already. :-) Dividing > >> our efforts is never a good idea. So the kdelibs-master branch would be > >> basically dead (no work going on there, no release from that code), > >> until the frameworks branch is merged into it. > > > > With a bit of delay, I just started the above plan: I created the > > frameworks branch in kdelibs (from kdelibs master), and I made kdelibs > > master frozen. > > > > To say this clearly: NO COMMITS ARE POSSIBLE IN KDELIBS MASTER. > > Unfortunately I'm not sure this will work. > > Looking at the commits in the framework branch so far (gitk frameworks) it > seems framework is the new master.
Since you are citing my commit i'll answer. I commited to frameworks because dfaure told me to. > I think maybe people didn't get the memo that there isn't going to be a KDE > 4.8? No, we didn't. Albert