GRASS bugs commit

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

GRASS bugs commit

Radim Blazek-2
Hi,
I am going to fix some GRASS related bugs. I was not contributing to
QGIS for a while so I want to ask you where I should commit the fixes.
Into 'trunk' I presume? Into some stable branches also?

BTW, can you please clarify (or point me to some place were it is
explained) how release branching is done?
I see Version-1_0 branch which I suppose was used to create
Release-1_0_0, Release-1_0_1 and Release-1_0_2?
Release-1_0_1 was created from Release-1_0_0 or from Version-1_0?
I don't see any Version-1_1 while Release-1_1_0 was created already.
Why Release-1_x_x are branches, not tags? A release must be unique, right?

Radim
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.osgeo.org/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

AW: GRASS bugs commit

Hugentobler  Marco
Hi Radim

Nice to see you are back!

Bugfixes should go into trunk and also be backported to the stable branch (Version-1_0) if it is possible.

Afaik the release branches receive changes related to packaging and release process. After the release, those changes are merged back. Tim knows more about the release process, so maybe he could add/correct.

Regards,
Marco


-----Ursprüngliche Nachricht----
Von: [hidden email] im Auftrag von Radim Blazek
Gesendet: Mi 13.05.2009 12:11
An: [hidden email]
Betreff: [Qgis-developer] GRASS bugs commit
 
Hi,
I am going to fix some GRASS related bugs. I was not contributing to
QGIS for a while so I want to ask you where I should commit the fixes.
Into 'trunk' I presume? Into some stable branches also?

BTW, can you please clarify (or point me to some place were it is
explained) how release branching is done?
I see Version-1_0 branch which I suppose was used to create
Release-1_0_0, Release-1_0_1 and Release-1_0_2?
Release-1_0_1 was created from Release-1_0_0 or from Version-1_0?
I don't see any Version-1_1 while Release-1_1_0 was created already.
Why Release-1_x_x are branches, not tags? A release must be unique, right?

Radim
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.osgeo.org/mailman/listinfo/qgis-developer

_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.osgeo.org/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: AW: GRASS bugs commit

Tim Sutton-4
Hi

Hugentobler Marco wrote:
> Hi Radim
>
> Nice to see you are back!

Yes welcome back Radim!

>
> Bugfixes should go into trunk and also be backported to the stable branch (Version-1_0) if it is possible.

Yes. Note that 1.0 is in feature freeze permenantly, so only bug fixes
go in there.

>
> Afaik the release branches receive changes related to packaging and release process. After the release, those changes are merged back. Tim knows more about the release process, so maybe he could add/correct.

Thats correct. Branches are made at point or release, or by developers
who want to work in a sandbox. Note that svn doesnt treat branches and
tags any differently like CVS does.

So if you are working in trunk, work here:

https://trac.osgeo.org/qgis/

And in the stable branch, work here:

https://svn.osgeo.org/qgis/branches/Version-1_0

Regards

Tim

>
> Regards,
> Marco
>
>
> -----Ursprüngliche Nachricht----
> Von: [hidden email] im Auftrag von Radim Blazek
> Gesendet: Mi 13.05.2009 12:11
> An: [hidden email]
> Betreff: [Qgis-developer] GRASS bugs commit
>  
> Hi,
> I am going to fix some GRASS related bugs. I was not contributing to
> QGIS for a while so I want to ask you where I should commit the fixes.
> Into 'trunk' I presume? Into some stable branches also?
>
> BTW, can you please clarify (or point me to some place were it is
> explained) how release branching is done?
> I see Version-1_0 branch which I suppose was used to create
> Release-1_0_0, Release-1_0_1 and Release-1_0_2?
> Release-1_0_1 was created from Release-1_0_0 or from Version-1_0?
> I don't see any Version-1_1 while Release-1_1_0 was created already.
> Why Release-1_x_x are branches, not tags? A release must be unique, right?
>
> Radim
> _______________________________________________
> Qgis-developer mailing list
> [hidden email]
> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>
> _______________________________________________
> Qgis-developer mailing list
> [hidden email]
> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>


--

Tim Sutton - QGIS Project Steering Committee Member (Release  Manager)
==============================================
Please do not email me off-list with technical
support questions. Using the lists will gain
more exposure for your issues and the knowledge
surrounding your issue will be shared with all.

Visit http://linfiniti.com to find out about:
  * QGIS programming and support services
  * Mapserver and PostGIS based hosting plans
  * FOSS Consulting Services
Skype: timlinux
Irc: timlinux on #qgis at freenode.net
==============================================

_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.osgeo.org/mailman/listinfo/qgis-developer
Reply | Threaded
Open this post in threaded view
|

Re: AW: GRASS bugs commit

Radim Blazek-2
Unfortunately the changes (still bugfixes only) dont seem to be just
few rows, so I'll submit them to trunk only. Later can be merged to
Version-1_0 when tested by users in trunk.

Radim

On Thu, May 14, 2009 at 7:28 AM, Tim Sutton <[hidden email]> wrote:

> Hi
>
> Hugentobler Marco wrote:
>>
>> Hi Radim
>>
>> Nice to see you are back!
>
> Yes welcome back Radim!
>
>>
>> Bugfixes should go into trunk and also be backported to the stable branch
>> (Version-1_0) if it is possible.
>
> Yes. Note that 1.0 is in feature freeze permenantly, so only bug fixes go in
> there.
>
>>
>> Afaik the release branches receive changes related to packaging and
>> release process. After the release, those changes are merged back. Tim knows
>> more about the release process, so maybe he could add/correct.
>
> Thats correct. Branches are made at point or release, or by developers who
> want to work in a sandbox. Note that svn doesnt treat branches and tags any
> differently like CVS does.
>
> So if you are working in trunk, work here:
>
> https://trac.osgeo.org/qgis/
>
> And in the stable branch, work here:
>
> https://svn.osgeo.org/qgis/branches/Version-1_0
>
> Regards
>
> Tim
>
>>
>> Regards,
>> Marco
>>
>>
>> -----Ursprüngliche Nachricht----
>> Von: [hidden email] im Auftrag von Radim Blazek
>> Gesendet: Mi 13.05.2009 12:11
>> An: [hidden email]
>> Betreff: [Qgis-developer] GRASS bugs commit
>>  Hi,
>> I am going to fix some GRASS related bugs. I was not contributing to
>> QGIS for a while so I want to ask you where I should commit the fixes.
>> Into 'trunk' I presume? Into some stable branches also?
>>
>> BTW, can you please clarify (or point me to some place were it is
>> explained) how release branching is done?
>> I see Version-1_0 branch which I suppose was used to create
>> Release-1_0_0, Release-1_0_1 and Release-1_0_2?
>> Release-1_0_1 was created from Release-1_0_0 or from Version-1_0?
>> I don't see any Version-1_1 while Release-1_1_0 was created already.
>> Why Release-1_x_x are branches, not tags? A release must be unique, right?
>>
>> Radim
>> _______________________________________________
>> Qgis-developer mailing list
>> [hidden email]
>> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>>
>> _______________________________________________
>> Qgis-developer mailing list
>> [hidden email]
>> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>>
>
>
> --
>
> Tim Sutton - QGIS Project Steering Committee Member (Release  Manager)
> ==============================================
> Please do not email me off-list with technical
> support questions. Using the lists will gain
> more exposure for your issues and the knowledge
> surrounding your issue will be shared with all.
>
> Visit http://linfiniti.com to find out about:
>  * QGIS programming and support services
>  * Mapserver and PostGIS based hosting plans
>  * FOSS Consulting Services
> Skype: timlinux
> Irc: timlinux on #qgis at freenode.net
> ==============================================
>
>
_______________________________________________
Qgis-developer mailing list
[hidden email]
http://lists.osgeo.org/mailman/listinfo/qgis-developer