<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8" /></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Or to say it differently: doesn't the term "swap around branches" apply much more to the original proposal which proposes "replacing" - in git terms "force push"?<br><br><div class="gmail_quote">On February 10, 2016 12:11:33 AM GMT+01:00, "Matthias Kuhn - <a href="http://OPENGIS.ch">OPENGIS.ch</a>" <matthias@opengis.ch> wrote:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Good point<br />
<br />
<br />
But doesn't the same apply to the switch at the end of the 3.0 development in an even worse way because we have the master branch replaced with an unmergeable substitute?<br />
<br />
Best<br />
Matthias<br /><br /><div class="gmail_quote">On February 9, 2016 11:20:50 PM GMT+01:00, Tim Sutton <tim@kartoza.com> wrote:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Hi<div class=""><br class="" /><div><blockquote type="cite" class=""><div class="">On 10 Feb 2016, at 00:15, Matthias Kuhn - <a href="http://opengis.ch" class="">OPENGIS.ch</a> <<a href="mailto:matthias@opengis.ch" class="">matthias@opengis.ch</a>> wrote:</div><br class="Apple-interchange-newline" /><div class="">Hi PSC,<br class="" />
<br class="" />
Thank you very much for taking a decision, that will help very much to get ahead!<br class="" />
<br class="" />
Just one question, did you evaluate to switch master with a qgis2 branch and qgis3 with master? So basically the same schema but with renamed branches.<br class="" />
IMHO that would make it clearer that devs are encouraged to work on qgis 3 and we would not have to "replace" a branch but instead just retire the qgis2 branch once the release happened.<br class="" /></div></blockquote><div><br class="" /></div><div>I think the problem with that is that there are a lot of downstream build activities that would break straight away if we swap branches around, whilst the intent is to keep master in a stable, packageable state while work goes on in the 3.0. branch.</div><div><br class="" /></div><div>Regards</div><div><br class="" /></div><div>Tim</div><br class="" /><blockquote type="cite" class=""><div class="">
<br class="" />
Thanks again and best wishes<br class="" />
<br class="" />
Matthias<br class="" />
<br class="" />
On February 9, 2016 11:30:28 AM GMT+01:00, Tim Sutton <<a href="mailto:tim@kartoza.com" class="">tim@kartoza.com</a>> wrote:<br class="" />
>Hi<br class="" />
><br class="" />
><br class="" />
>On Tue, Feb 9, 2016 at 2:58 AM, Larry Shaffer <<a href="mailto:larrys@dakotacarto.com" class="">larrys@dakotacarto.com</a>><br class="" />
>wrote:<br class="" />
><br class="" />
>> Hi Tim, Jürgen and PSC,<br class="" />
>><br class="" />
>> After reviewing this plan I have to say it is an excellent solution<br class="" />
>to a<br class="" />
>> no-size-fits-all problem. Thank you for all the consideration and<br class="" />
>work you<br class="" />
>> have put into it.<br class="" />
>><br class="" />
>> I now have a solid (and indeterminate :^) schedule to present to my<br class="" />
>> employer, which will help them plan resources to fund further QGIS<br class="" />
>> development.<br class="" />
>><br class="" />
>> It will also help with planning on how/when to produce new nightlies<br class="" />
>for<br class="" />
>> Mac.<br class="" />
>><br class="" />
><br class="" />
>Thanks Larry - I will post my blog post summarising everything tonight<br class="" />
>(including salient bits from the above discussion). Yes its<br class="" />
>interterminate,<br class="" />
>but I think the general aim is still to try to encourage everyone to<br class="" />
>get it<br class="" />
>ready for 1 year from now (as much as we can).<br class="" />
><br class="" />
>Regards<br class="" />
><br class="" />
>Tim<br class="" />
><br class="" />
><br class="" />
><br class="" />
>><br class="" />
>> Regards,<br class="" />
>><br class="" />
>> Larry Shaffer<br class="" />
>> QGIS Support/Development | Boundless<br class="" />
>><br class="" />
>> Dakota Cartography<br class="" />
>> Black Hills, South Dakota<br class="" />
>><br class="" />
>> On Mon, Feb 8, 2016 at 7:45 AM, Jürgen E. <<a href="mailto:jef@norbit.de" class="">jef@norbit.de</a>> wrote:<br class="" />
>><br class="" />
>>> Hi Tim,<br class="" />
>>><br class="" />
>>> On Mon, 08. Feb 2016 at 14:01:12 +0200, Tim Sutton wrote:<br class="" />
>>> > Thanks Andreas - I’ll just paraphrase the above as another note in<br class="" />
>the<br class="" />
>>> > article - should make things a bit clearer!<br class="" />
>>><br class="" />
>>> Yes. We do 2.16 with PyQt5/Python3 support next to the existing<br class="" />
>>> Qt4/PyQt4/Python2 and the existing and widely unused Qt5 support. <br class="" />
>So we<br class="" />
>>> have<br class="" />
>>> all the smooth, non-breaking steps in master. We'll still release<br class="" />
>using<br class="" />
>>> Qt4/PyQt4/Python2, so that all the plugins keep working. And people<br class="" />
>can<br class="" />
>>> complete stuff that they have already started working on.<br class="" />
>>><br class="" />
>>> 2.16 will be in the regular 4 months schedule.<br class="" />
>>><br class="" />
>>> After 2.16 we branch off a qgis3 branch that gets the API changes. <br class="" />
>There<br class="" />
>>> we<br class="" />
>>> drop Qt4/PyQt4/Python2 support and switch to Qt5/PyQt5/Python3. <br class="" />
>Because<br class="" />
>>> we<br class="" />
>>> cannot really estimate if that takes 4, 8 or even more months, we'll<br class="" />
>work<br class="" />
>>> on<br class="" />
>>> that on a "release when ready" scheme an see how it goes and set a<br class="" />
>date<br class="" />
>>> when<br class="" />
>>> qgis3 stabilized.<br class="" />
>>><br class="" />
>>> The qgis3 branch will be in development so at first we'll probably<br class="" />
>have<br class="" />
>>> something that doesn't build at all, requires dependencies that are<br class="" />
>not<br class="" />
>>> easy<br class="" />
>>> available or at least not available on all platforms, while we're at<br class="" />
>it.<br class="" />
>>><br class="" />
>>> Because there might be stuff, that can't wait that long, we<br class="" />
>meanwhile keep<br class="" />
>>> master open for new features. The nightlies can keep on going<br class="" />
>without<br class="" />
>>> much<br class="" />
>>> effort and also regular releases could be done if necessary.<br class="" />
>>><br class="" />
>>> But master should still considered a dead branch as we is relies on<br class="" />
>fading<br class="" />
>>> dependencies and it will be eventually be replaced by the qgis3 (no<br class="" />
>>> merge). So<br class="" />
>>> stuff added to master before will get lost, if it was not also<br class="" />
>merged or<br class="" />
>>> redone<br class="" />
>>> for qgis3. So people should think twice if they consider to do<br class="" />
>anything<br class="" />
>>> in<br class="" />
>>> master while we're at qgis3.<br class="" />
>>><br class="" />
>>><br class="" />
>>> Jürgen<br class="" />
>>><br class="" />
>>> --<br class="" />
>>> Jürgen E. Fischer norBIT GmbH Tel.<br class="" />
>>> +49-4931-918175-31<br class="" />
>>> Dipl.-Inf. (FH) Rheinstraße 13 Fax.<br class="" />
>>> +49-4931-918175-50<br class="" />
>>> Software Engineer D-26506 Norden<br class="" />
>>> <a href="http://www.norbit.de/" class="">http://www.norbit.de</a><br class="" />
>>> QGIS release manager (PSC) Germany IRC: jef on<br class="" />
>>> FreeNode<br class="" />
>>><br class="" />
>>> _______________________________________________<br class="" />
>>> Qgis-psc mailing list<br class="" />
>>> <a href="mailto:Qgis-psc@lists.osgeo.org" class="">Qgis-psc@lists.osgeo.org</a><br class="" />
>>> <a href="http://lists.osgeo.org/mailman/listinfo/qgis-psc" class="">http://lists.osgeo.org/mailman/listinfo/qgis-psc</a><br class="" />
>>><br class="" />
>><br class="" />
>><br class="" />
>> _______________________________________________<br class="" />
>> Qgis-psc mailing list<br class="" />
>> <a href="mailto:Qgis-psc@lists.osgeo.org" class="">Qgis-psc@lists.osgeo.org</a><br class="" />
>> <a href="http://lists.osgeo.org/mailman/listinfo/qgis-psc" class="">http://lists.osgeo.org/mailman/listinfo/qgis-psc</a><br class="" />
>><br class="" />
><br class="" />
><br class="" />
><br class="" />
>-- <br class="" />
>------------------------------------------------------------------------------------------<br class="" />
>Tim Sutton<br class="" />
>Visit <a href="http://kartoza.com/" class="">http://kartoza.com</a> to find out about open source:<br class="" />
> * Desktop GIS programming services<br class="" />
> * Geospatial web development<br class="" />
>* GIS Training<br class="" />
>* Consulting Services<br class="" />
>Skype: timlinux Irc: timlinux on #qgis at <a href="http://freenode.net/" class="">freenode.net</a><br class="" />
>Tim is a member of the QGIS Project Steering Committee<br class="" />
>-------------------------------------------------------------------------------------------<br class="" />
>Kartoza is a merger between Linfiniti and Afrispatial<br class="" />
><br class="" />
><br class="" />
>------------------------------------------------------------------------<br class="" />
><br class="" />
>_______________________________________________<br class="" />
>Qgis-psc mailing list<br class="" />
><a href="mailto:Qgis-psc@lists.osgeo.org" class="">Qgis-psc@lists.osgeo.org</a><br class="" />
><a href="http://lists.osgeo.org/mailman/listinfo/qgis-psc" class="">http://lists.osgeo.org/mailman/listinfo/qgis-psc</a><br class="" />
<br class="" />
-- <br class="" />
Sent from my Android device with K-9 Mail. Please excuse my brevity.<br class="" />
-- <br class="" />
Sent from my Android device with K-9 Mail. Please excuse my brevity.</div></blockquote></div><br class="" /><div class="">
<div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-align: center;" class=""><span>—</span></div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-align: center;" class=""><span><br class="" /></span></div><span style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px;
text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><br class="Apple-interchange-newline" /><span><img height="66" width="160" apple-inline="yes" id="74FB3395-6ADF-4FCD-85D3-9274C47AEBF4" apple-width="yes" apple-height="yes" src="cid:62C890D4-3964-4609-BDE6-7536D5FBDD70" class="" /></span><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-align: center;" class=""><br class="Apple-interchange-newline" /><br class="" /></div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-indent: 0px; text-transform: none;
white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-align: center;" class="">Tim Sutton</div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-align: center;" class=""><br class="" /></div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><div style="text-align: center;" class="">Visit <a href="http://kartoza.com" class="">http://kartoza.com</a> to find out about
open source:</div><div style="text-align: center;" class=""><br class="" /></div><div class=""><div style="text-align: center;" class="">* Desktop GIS programming services</div><div style="text-align: center;" class="">* Geospatial web development</div><div style="text-align: center;" class="">* GIS Training</div><div style="text-align: center;" class="">* Consulting Services</div><div style="text-align: center;" class=""><br class="" /></div><div class=""><div style="text-align: center;" class="">Skype: timlinux Irc: timlinux on #qgis at <a href="http://freenode.net" class="">freenode.net</a></div><div style="text-align: center;" class="">Tim is a member of the QGIS Project Steering Committee</div><div style="text-align: center;" class=""><br class="" /></div><div style="text-align: center;" class="">Kartoza is a merger between Linfiniti and Afrispatial</div></div></div></div>
</span></div>
<br class="" /></div></blockquote></div><br /></blockquote></div><br>
-- <br>
Sent from my Android device with K-9 Mail. Please excuse my brevity.</body></html>