[GRASS-dev] too many branches

[Michael Barton]

The way I thought I understood the plan is that we would have an odd numbered version for development, testing, etc and an even numbered release version. So it has seemed to me that 6.4.3 is the place where we were supposed to be testing any enhancements and bug fixes before doing an even numbered 'stable' release. So I too have remained confused about why we needed a testing/development version 6.5 that fed into a testing/development version 6.4.3, that fed into a final stable release (6.4 on the way). But maybe I misunderstand this workflow and someone can explain it to me.

But that can be all moot now that we are moving towards a 6.4.4 release. 

Why don't we:

1) freeze (really freeze this time) 6.x for new features after the 6.4.4 release
2) keep 6.5 for bug fixes (bug fixes only, no enhancements, no backports of new features) to the 6.x line
3) start a 7.0 release branch and a 7.1 dev branch so that we can begin to move toward a GRASS 7 release

How does this sound???

Michael

____________________
C. Michael Barton
Director, Center for Social Dynamics & Complexity 
Professor of Anthropology, School of Human Evolution & Social Change
Arizona State University

voice: 	480-965-6262 (SHESC), 480-727-9746 (CSDC)
fax:          480-965-7671 (SHESC),  480-727-0709 (CSDC)
www: http://www.public.asu.edu/~cmbarton, http://csdc.asu.edu




On Aug 22, 2012, at 6:32 AM, <grass-dev-request at lists.osgeo.org>
 wrote:

> From: Markus Neteler <neteler at osgeo.org>
> Date: August 22, 2012 6:18:32 AM MST
> To: GRASS developers list <grass-dev at lists.osgeo.org>
> Subject: Re: [GRASS-dev] too many branches
> 
> 
> On Wed, Aug 22, 2012 at 3:07 PM, Martin Landa <landa.martin at gmail.com> wrote:
>> 2012/8/22 Hamish <hamish_b at yahoo.com>:
>>>> Is there any comparison of devbr6 a relbr64?
> 
> Yes:
> diff -ru --exclude=".svn" grass64_release grass65_release
> 
> To even exclude the timestamp differences in the HTML pages:
> diff -ru --exclude=".svn" --exclude=".html" grass64_release
> grass65_release  | wc -l
> 856878
> 
> Not really the same :)
> 
>>>> I am pretty sure
>>>> that many changes, fixes which has been committed to devbr6
>>>> were not applied later in relbr64.
>>> 
>>> very serious question: does it matter? if it is a serious bug
> 
> Yes: most tickets I have indicated earlier which contain a backport
> promise are relevant.
> 
> I have gone before every GRASS 6 release through this branch
> differences. It took me every time days. And I start to not have
> that time any more to catch up with incomplete tickets... (see above).
> 
> And yes, energy should go of course into GRASS 7.
> 
> MarkusN
> 
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/grass-dev/attachments/20120822/057736c5/attachment-0001.html>