[Qgis-developer] Branch status for merge and release timeline proposal

[Martin Dobias]

Hi Tim

On Tue, Mar 1, 2011 at 8:19 AM, Tim Sutton <lists at linfiniti.com> wrote:
> Hi all especially Martin and Pirmin and those actively working on new features
>
> I am just wondering how things are looking in terms of merging
> branches. Is a merge of threaded rendering + 3d globe on the cards for
> 1.7 assuming we have a code freeze of around March 15? I'd like to get
> 1.7 out before the hackfest (oops QGIS Meeting) so was thinking along
> the lines of :
>
> - code freeze 15 march
> - string freeze 21 march
> - release branching 1 April (yes I know its a cool date to release the
> code on :-)
> - release announcements 7 April (or when packages are available

(I guess you mean _feature_ freeze on 15 march)

Let's see how much time I will find during this weekend to start
merging the stuff. I'm not sure how long that will take - depends on
the amount of conflicts that have to be resolved manually. I wonder if
git could be a more productive tool than svn for such big merges, but
given that I am still a beginner with git, I will probably stick with
good old painful merging with svn :-)

Regards
Martin