On Saturday 21 February 2009 16:19:51 Lukas Oboril wrote: > Now we are committing into 'devel' especially into kde-4.1.4 branch > .... it is good ... but !!! I think some of those commits should go > into default branch too, because they are touching FOSS* bits ... so > my proposals in this point are ... > > 1. merge branches together, kde-4.1.4 will be master in that merge. > 2. synchro 'devel' and 'stable'
Good ideas. I realise now that the KDE 4.1.4 branch happened too soon -- I had hoped that the FOSS dependencies would be relatively stable by now and that there would not be much churn and update going on there. I was wrong about that, since we've continued to struggle with all the dependency packages and builds in different flavors. What I've done in specs-dev is merged the kde-4.1.4 branch back onto default and deactivated default. This means that that repo has only *one* branch going on, and it's for KDE 4.1.4. So that's one simplification. I like your suggestion to sync things at major milestones, from one repo to another. So when we reach KDE 4.1.4, we push that to kde4-specs (or the Sun- based spec repo) and then carry on development towards KDE 4.2.0 in specs-dev again. That trades off repos for branches, which -- again in retrospect -- might be a good thing. We can always continue to work on things in the kde4- specs repo to bugfix a given milestone. That's a second simplification. [[ I've also pushed the content of -specs-dev to -specs just now, so it reflects the state of KDE 4.1.4 development right now. ]]
