My major concern with the 1.8 release is getting all the non api breaking features from master into the 1.8 branch and keeping track of which ones are in there. master is so fast moving that it's hard to keep track, especially when the order of commits (and some of the ids) are different to the master line. <div>
<br></div><div>I tried to do a: git log master..release-1_8 which tells you which commits are differing between the two branches. I counted 589 commits using wc -l <div><br></div><div>IMHO what would be better would be to branch 1.8 from master now and revert the commits that we know break API using: git revert {commit id}. Dealing with conflicts as we go. I think the number of reverts would be less then the number of commits that need to be cherry-picked and conflicts resolved. I'm not sure how many parts of QGIS are relying on the the breaking API parts but I suspect it wouldn't be many. </div>
<div><br></div><div>Unless someone knows a better way to handle this.</div><div><br></div><div>- Nathan <br><br><div class="gmail_quote">On Sat, Mar 31, 2012 at 4:48 PM, Marco Hugentobler <span dir="ltr"><<a href="mailto:marco.hugentobler@sourcepole.ch">marco.hugentobler@sourcepole.ch</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi<div class="im"><br>
<br>
>The public repo has<br>
>not seen any change in the last two months<br>
<br></div>
There is a raster_resampler branch in the public repo (with no change in the last two months) and the raster_resampler branch in the mhugent clone. In the second repo, I continously redesigned the raster layer class. At the moment, I'm splitting the writeXML / readXML code of the raster layer class to the renderer subclasses. My plan was to have the code mergeable until the developer meeting in Lyon and discussing pending issues there (e.g. gui design).<br>
<br>
It would be possible for me to put some effort into it tomorrow to make the code mergeable. But then, it is very likely it introduces new issues because it changes large parts of QgsRasterLayer / QgsRasterLayerProperties (but it also resolves a few existing issues). So it probably is too risky for 1.8 (even if it does not break the API).<br>
<br>
Regards,<br>
Marco<div class="im"><br>
<br>
On 30.03.2012 22:10, Tim Sutton wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi<br>
<br>
On Fri, Mar 30, 2012 at 5:31 PM, MORREALE Jean Roc<br>
<<a href="mailto:jr.morreale@enoreth.net" target="_blank">jr.morreale@enoreth.net</a>> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi,<br>
<br>
Could the raster resampling branch be merged for 1.8 ? The public repo has<br>
not seen any change in the last two months so there is no added value of<br>
keeping it apart, maybe it's time to throw it to the crow to get more<br>
backup.<br>
<br>
</blockquote>
Marco - are you ready to merge?<br>
<br>
Regards<br>
<br>
Tim<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
regards,<br>
jean-roc<br>
<br>
______________________________<u></u>_________________<br>
Qgis-developer mailing list<br>
<a href="mailto:Qgis-developer@lists.osgeo.org" target="_blank">Qgis-developer@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/qgis-developer" target="_blank">http://lists.osgeo.org/<u></u>mailman/listinfo/qgis-<u></u>developer</a><br>
</blockquote>
<br>
<br>
</blockquote>
<br>
<br>
-- <br></div>
Dr. Marco Hugentobler<br>
Sourcepole - Linux& Open Source Solutions<br>
Churerstrasse 22, CH-8808 Pfäffikon SZ, Switzerland<br>
<a href="mailto:marco.hugentobler@sourcepole.ch" target="_blank">marco.hugentobler@sourcepole.<u></u>ch</a> <a href="http://www.sourcepole.ch" target="_blank">http://www.sourcepole.ch</a><br>
Technical Advisor QGIS Project Steering Committee<div class="HOEnZb"><div class="h5"><br>
<br>
______________________________<u></u>_________________<br>
Qgis-developer mailing list<br>
<a href="mailto:Qgis-developer@lists.osgeo.org" target="_blank">Qgis-developer@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/qgis-developer" target="_blank">http://lists.osgeo.org/<u></u>mailman/listinfo/qgis-<u></u>developer</a><br>
</div></div></blockquote></div><br></div></div>