Fwd: Forward porting policy

[David Faure]

On Tuesday 31 January 2012 14:54:09 Dario Freddi wrote:
> 2012/1/31 David Faure <faure at kde.org>:
> > On Thursday 26 January 2012 16:12:22 Dario Freddi wrote:
> >> Forwarding to framework, hoping somebody here cares...
> > 
> > I don't see the relation. I could answer all these questions for kdelibs,
> > but your question is about kde-workspace, which isn't part of the
> > frameworks effort at all, at the moment.
> 
> Besides the fact that apparently kde-core-devel is kind of dead these
> days (especially for these discussions), my question was pretty much
> applicable to all of KDE - I just took that situation as an example.
> This happened to me when trying to merge some changes from 4.8 to
> frameworks in kdelibs, for example. My main point is that we need a
> clear policy on the branch workflow in all KDE modules.

For kdelibs I can answer, as I said :)


>> 1. Should 4.x always be fully merged into master? Just to avoid
>> merging to master other commits from other developers which weren't
>> meant to be there

Yes.

[since no development happens in kdelibs master anyway, so this is probably 
different for other modules, where master could have a different fix...]

>> 2. Are commits from scripty ok to be merged?

Yes, since scripty doesn't run in kdelibs-master nor in kdelibs-frameworks, 
anyway.

[which is probably very different for other modules]

>> 3. Should I just commit to 4.8 or wait for somebody else to do the
>> merge periodically (optimal solution IMHO)?

This is how it works for kdelibs, yes. But I'm definitely not sure people use 
'git merge' in other modules.

-- 
David Faure, faure at kde.org, http://www.davidfaure.fr
Sponsored by Nokia to work on KDE, incl. KDE Frameworks 5