Re: [Development] RFC: What constitutes a non-destabilising bug-fix?

2012-12-09 Thread Marc Mutz 
On Saturday December 8 2012, Thiago Macieira wrote:
[...]
 We'll create the releases branch for the RC2 then.

Ok, trying to summarise, I understand it this way:

1. release-critical fixes are submitted and merged to 'stable' now,
   'release' later, when it exists.
   No-brainer fixes are also welcome.
2. bug-fixes that don't violate string or BC freezes are submitted,
   but NOT merged, against stable.
   They will be merged once RC2 is tagged and 'release' is branched off.
   Maintainers and other reviewers can redirect a fix to 'dev' instead,
   but all fixes that don't require string or BiC changes should initially be
   submitted to 'stable'.
   [Personally, I'd add that if a fix goes to 'dev' instead of 'stable',
   then the commit message should say why.]
3.  new features and bug-fixes that require new strings or BiC changes should
   be submitted to 'dev' directly.

Correct?

BTW: Two of the three commits that have landed in 'dev' so far are bug-fixes 
(one bug-fix and one tests/-only change, to be precise; the third is the 
addition of changes-5.1.0), which shows that the 'stable' rules seem to be 
interpreted too strictly, currently.

Thanks,
Marc

-- 
Marc Mutz marc.m...@kdab.com | Senior Software Engineer
KDAB (Deutschland) GmbH  Co.KG, a KDAB Group Company
www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-Independent Software Solutions
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] RFC: What constitutes a non-destabilising bug-fix?

2012-12-09 Thread Sune Vuorela 
On 2012-12-09, Sune Vuorela nos...@vuorela.dk wrote:
 On 2012-12-09, Marc Mutz marc.m...@kdab.com wrote:
 3.  new features and bug-fixes that require new strings or BiC changes should
be submitted to 'dev' directly.

 binary incompatible changes should not be submitted anywhere except for
 Qt6.

I've asked to clarify the above.

There is a special thing from now until 5.0 is out where under certain
circumstances, BiC changes can happen, and should under those certain
circumstances happen in all branches targetting 5.y.z. Until 5.0 is out.
Find those certain circumstances and a howto in a relevant mail from the
chief maintainer.

Once 5.0 is out, my above sentence should apply.

/Sune

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development