kde-runtime module master and KDE/4.9 branches

Laszlo Papp lpapp at kde.org
Thu Oct 11 20:02:51 BST 2012


> I think the problem is we don't know the commit policy for kde-runtime. Is it:
>
> fix-master-and-backport: fix in master, cherry-pick to KDE/4.x
>
> -- or --
>
> fix-stable-and-merge: fix in KDE/4.x, merge KDE/4.x in master

I personally prefer the former as in contributors should make sure if
it is fixed in master, and if not, fix there, otherwise cherry-pick.
That way the preference would be to focus on having the bug fixes in
the upcoming releases rather than in stable releases. Having those
fixes in stable releases may mean that they are not available for a
(sometimes long) while in the upcoming releases in case of missed
merges.

> - modify the commit-hook for KDE/4.x branches to show a message recommending
> merging changes to master (optionally pointing to instructions on the wiki for
> more info)

> - set up a nag system to send an email/post on irc if there are unmerged
> commits and last merge-to-master is older than 2 or 3 days.

I recall we had nagging emails previously about license issues and so
forth. To be consistent with the handling of those, I would prefer the
latter personally.

Laszlo




More information about the kde-core-devel mailing list