Fixes in Git (first in stable, then merge to master)

Martin Gräßlin mgraesslin at
Sat Jul 23 07:52:48 BST 2011

On Saturday 23 July 2011 01:42:16 David Jarvie wrote:
> On Saturday 23 July 2011 00:00:16 Nicolas Alvarez wrote:
> > There is no active policy saying you're supposed to merge. Almost everybody 
> > in KDE is still doing cherry-picks. KDevelop is the only KDE project I know 
> > that consistently uses forward-merges from the stable branch to master.
> > 
> > ---
> > 
> > It *would* be good to switch to the new workflow of doing changes in the 
> > lowest supported branch and up-merging, but it's not that easy. We need to:
> > 
> > - Figure out how to solve the scripty problem. scripty does its own 
> > conflicting commits to .desktop files in both branches, and that won't 
> > change[1]. We probably need a custom merge tool for .desktop-like files that 
> > ignores translations.
> > 
> > - Check if there is any change in 4.7 that isn't in master, and if so, see 
> > if that's intentional (4.7-specific hack, or the version bumps) or an 
> > oversight (never cherry-picked into master).
> > 
> > - Do the initial merge from 4.7 to master, solving the conflicts. The more 
> > they have diverged, the harder this is.
> > 
> > - Get *everyone* to start with the new workflow for that particular 
> > repository (see below). Else, if some people keep cherry-picking while 
> > others expect merging, the next one to try merging may get conflicts about 
> > all the cherry-picks people did since the last merge, and a merge will make 
> > commits appear duplicated in the log (as ossi pointed out to me).
> During the stable branch freeze before a minor version release (such as currently before 
the 4.7 release), it isn't possible to commit bug fixes to stable first and then merge to master. 
Only master can be committed to, so presumably we'll have to continue to commit to master 
and cherry-pick later once the freeze ends. Either that or change the policy on freezes.
Seriously: is this technically enforced or is it believed that developers know about it?
Personally I have no idea when the stable branch will be tagged or released. I commit to the 
stable branch in order to fix a bug and in the hope that it will some day end on the users' 
systems. But I do not care when this will happen and I never was blocked because of some 
tagging freeze.

So unless this is not technically enforced, the policy are nice words which I beleive nobody 
cares about.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <>

More information about the kde-core-devel mailing list