[Qgis-developer] Feature freeze for 1.8 - 31 March 23h59 GMT 2012

[Nathan Woodrow]

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.

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

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.

Unless someone knows a better way to handle this.

- Nathan

On Sat, Mar 31, 2012 at 4:48 PM, Marco Hugentobler <
marco.hugentobler at sourcepole.ch> wrote:

> Hi
>
>
> >The public repo has
> >not seen any change in the last two months
>
> 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).
>
> 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).
>
> Regards,
> Marco
>
>
> On 30.03.2012 22:10, Tim Sutton wrote:
>
>> Hi
>>
>> On Fri, Mar 30, 2012 at 5:31 PM, MORREALE Jean Roc
>> <jr.morreale at enoreth.net>  wrote:
>>
>>> Hi,
>>>
>>> Could the raster resampling branch be merged for 1.8 ? The public repo
>>> has
>>> not seen any change in the last two months so there is no added value of
>>> keeping it apart, maybe it's time to throw it to the crow to get more
>>> backup.
>>>
>>>  Marco - are you ready to merge?
>>
>> Regards
>>
>> Tim
>>
>>  regards,
>>> jean-roc
>>>
>>> ______________________________**_________________
>>> Qgis-developer mailing list
>>> Qgis-developer at lists.osgeo.org
>>> http://lists.osgeo.org/**mailman/listinfo/qgis-**developer<http://lists.osgeo.org/mailman/listinfo/qgis-developer>
>>>
>>
>>
>>
>
> --
> Dr. Marco Hugentobler
> Sourcepole -  Linux&  Open Source Solutions
> Churerstrasse 22, CH-8808 Pfäffikon SZ, Switzerland
> marco.hugentobler at sourcepole.**ch <marco.hugentobler at sourcepole.ch>
> http://www.sourcepole.ch
> Technical Advisor QGIS Project Steering Committee
>
>
> ______________________________**_________________
> Qgis-developer mailing list
> Qgis-developer at lists.osgeo.org
> http://lists.osgeo.org/**mailman/listinfo/qgis-**developer<http://lists.osgeo.org/mailman/listinfo/qgis-developer>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/qgis-developer/attachments/20120331/021a8517/attachment-0001.html