Hi On 10/24/2015 01:27 PM, Jürgen E. Fischer wrote: > Hi Mathieu, > > On Sat, 24. Oct 2015 at 09:44:31 +0700, Mathieu Pellerin wrote: >> On a psychological level, as the heavy development of new features has in the >> past mostly taken place on the master branch, it'd make it clearer to devs >> that the heavy feature development takes place there, and not on the 2.14 >> LTR branch. > Like symbology-ng, multithreaded rendering and the new geometry classes? I > think most major features have been developed in a separate branch and > then merged into master, when they reached a good enough state. > > I think master should constantly be in a reasonably good state - which the > Qt5/PyQt5/Python3 branch will probably initially not be. But hopefully after > four month of work it will - ready to me merged back into master. > > And as for new features in 2.14 I'm not so sure either - new features don't > help with the porting. And who adds features must be aware, that it also > needs > to be mergable into the other branch or if that's not possible reimplemented > for it. That should keep people from doing major stuff unless they really are > prepared to do it twice. > > I'd say we should replace master with the other branch after 2.14 (like in > [0]).
Can we not just develop in a separate branch, merge features back into master whenever they are ready. Be it before or after release of 2.14 LTR. I am afraid that working on two separate branches will effectively lead to imporant work being done twice. Bugfixes forgotten to be ported... Why not: * Branch off one py3/pyqt5 development branch now. * Introduce a compile time switch to control if python2 or python3 code binaries should be compiled * Merge back into master * Release 2.14 (For which the release will happen with python2, pyqt4 but which supports python3 and pyqt5) * Drop deprecated stuff * Merge API breaking features targetted for QGIS 3. Matthias > > > Jürgen > > > [0] > http://stackoverflow.com/questions/2862590/how-to-replace-master-branch-in-git-entirely-from-another-branch). > > > > _______________________________________________ > Qgis-developer mailing list > Qgis-developer@lists.osgeo.org > http://lists.osgeo.org/mailman/listinfo/qgis-developer
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Qgis-developer mailing list Qgis-developer@lists.osgeo.org http://lists.osgeo.org/mailman/listinfo/qgis-developer
