<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
Hi<br>
<br>
<div class="moz-cite-prefix">On 10/24/2015 01:27 PM, Jürgen E.
Fischer wrote:<br>
</div>
<blockquote cite="mid:20151024112717.GB10985@norbit.de" type="cite">
<pre wrap="">Hi Mathieu,
On Sat, 24. Oct 2015 at 09:44:31 +0700, Mathieu Pellerin wrote:
</pre>
<blockquote type="cite">
<pre wrap="">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.
</pre>
</blockquote>
<pre wrap="">
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]).</pre>
</blockquote>
<br>
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.<br>
<br>
I am afraid that working on two separate branches will effectively
lead to imporant work being done twice. Bugfixes forgotten to be
ported...<br>
<br>
Why not:<br>
<br>
* Branch off one py3/pyqt5 development branch now.<br>
* Introduce a compile time switch to control if python2 or python3
code binaries should be compiled<br>
* Merge back into master<br>
* Release 2.14 (For which the release will happen with python2,
pyqt4 but which supports python3 and pyqt5)<br>
* Drop deprecated stuff<br>
* Merge API breaking features targetted for QGIS 3.<br>
<br>
Matthias<br>
<br>
<blockquote cite="mid:20151024112717.GB10985@norbit.de" type="cite">
<pre wrap="">
Jürgen
[0] <a class="moz-txt-link-freetext" href="http://stackoverflow.com/questions/2862590/how-to-replace-master-branch-in-git-entirely-from-another-branch">http://stackoverflow.com/questions/2862590/how-to-replace-master-branch-in-git-entirely-from-another-branch</a>).
</pre>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Qgis-developer mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Qgis-developer@lists.osgeo.org">Qgis-developer@lists.osgeo.org</a>
<a class="moz-txt-link-freetext" href="http://lists.osgeo.org/mailman/listinfo/qgis-developer">http://lists.osgeo.org/mailman/listinfo/qgis-developer</a></pre>
</blockquote>
<br>
</body>
</html>