AW: [Qgis-developer] Merging composer and vlayer changes

[Hugentobler Marco]

Hi Tim,

Yes, those changes are really hard to merge as they crossed Jürgens changes in trunk. I therefore left the revisions 9087 - 9115 out in the merge. As you know better about the code changes in those revesions, it would be good if you could merge them.

Regards,
Marco    


-----Ursprüngliche Nachricht-----
Von: Tim Sutton [mailto:tim at linfiniti.com]
Gesendet: Fr 22.08.2008 21:45
An: Hugentobler  Marco
Cc: QGIS Developer Mailing List
Betreff: Re: [Qgis-developer] Merging composer and vlayer changes
 
Hi



2008/8/22 Hugentobler  Marco <marco.hugentobler at karto.baug.ethz.ch>:
> Hi Tim,
>
> It will take longer for me to do the merge. I have tons of svn conflicts to resolve.

Oops - I hope thats not the result of my recent commits - if it is my
apologies - I tried to not commit anything that would cause you
problems!

> I think it's going to be saturday or sunday until the composer merge is ready.

Ok - I may push the feature freeze back a few days to accommodate this.

Regards

Tim

>
> Regards,
> Marco
>
>
> -----Ursprüngliche Nachricht-----
> Von: qgis-developer-bounces at lists.osgeo.org im Auftrag von Tim Sutton
> Gesendet: Mi 20.08.2008 00:37
> An: QGIS Developer Mailing List
> Betreff: [Qgis-developer] Merging composer and vlayer changes
>
> Hi Folks (esp Juergen and Marco)
>
> I would like to ask if it is possible to merge in your changes to
> trunk before feature freeze deadline as I would like to make a number
> of API cleanups and changes after you have merged in. I am doing my
> API cleanups mostly by script but some parts are manual and it would
> be better to have pending changes in trunk before I do it.
>
> Many thanks,
>
>
> --
> Tim Sutton - QGIS Project Steering Committee Member (Release  Manager)
> ==============================================
> Visit http://linfiniti.com to find out about:
>  * QGIS programming for hire
>  * Mapserver and PostGIS based hosting plans
>  * FOSS Consulting Services
> Skype: timlinux Irc: timlinux on #qgis at freenode.net
> ==============================================
> _______________________________________________
> Qgis-developer mailing list
> Qgis-developer at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>
>



-- 
Tim Sutton - QGIS Project Steering Committee Member (Release Manager)
==============================================
Visit http://linfiniti.com to find out about:
 * QGIS programming services
 * Mapserver and PostGIS based hosting plans
 * FOSS Consulting Services
Skype: timlinux Irc: timlinux on #qgis at freenode.net
==============================================