[GRASS-dev] GRASS CVS to SVN migration: repository structure

[Hamish]

> Glynn Clements:
> > I'm unclear on how further 6.x development is to be handled.
> >
> > In the medium term, I would expect there to be futher development on
> > 6.x culminating in a 6.4 release. This will need to occur on a
> > separate branch to 7.x. E.g.:
> >
> >         +----+----> 7.x-devel
> >              |
> >              +----+----+--------> 6.x-devel
> >                   |    |
> >                   |    +----> 6.4-release
> >                   |
> >                   +----> 6.3-release
> >
> > The 6.x-devel and 6.3-release branches would be created immediately,
> > with 6.4-release created once 6.x-devel has accumulated changes which
> > cannot go into the 6.3.x releases.
> >
> > The trunk would become 7.x-devel, and would quickly change to the
> > point that merging changes with 6.x-devel would become impractical.

Martin wrote:
> proposal...
> 
> +--+-----+-----> 7.x-devel (trunk)
> |    |      |
> |    |      +------> 6.4-release (branch) <--- should be created [ASAP]
> |    |          |
> |    |          | backports (6.4 -> 6.3)
> |    |          |
> |    +-------------> 6.3-release (branch)


I much prefer Glynn's proposal.

6.3.0 release branch is not meant to be a stable branch. We can fix bugs in it,
but if its purpose is to help get the MS Windows stuff tested, then that's a
lot of backporting from 6.x/HEAD when we get ready for 6.3.1. (or just make
6.3.1 a new branch from 6.x/HEAD). I consider it like 6.1.0, ie a dead-end
preview release.

6.4 requires a stable wxGUI, this isn't going to happen instantly. Porting
everything from 6.x/HEAD back into the 6.4 r.b. for months seems like a huge
waste of effort. Thus I think creating a 6.4 release branch ASAP is a mistake.
Let's do it when the code it ready.

There should be no need to port stuff back to 6.3 r.b. once we have a 6.4 r.b.
>From then on we call the new preview releases 6.4beta1, etc. and forget 6.3.


We will need some strong discipline to put all new development into 7.x/HEAD
and backport interesting things to 6.x/HEAD; not the other way around.


Hamish



      ____________________________________________________________________________________
Looking for last minute shopping deals?  
Find them fast with Yahoo! Search.  http://tools.search.yahoo.com/newsearch/category.php?category=shopping