[Freeciv-Dev] Re: CVS Development branch

[Reinier Post <rp@xxxxxxxxxx>]

On Mon, Jul 15, 2002 at 10:36:30AM +0200, Davide Pagnin wrote:
>       Hi all!

Hello,

> I propose to take the decision to maintain two branches of the CVS:
> 
> 1. Main development branch, named 1.14.x-devel, and every time a new
> feature is added, increment the patch level 1.14.(x+1)-devel and so on.
> 
> 2. Main stable branch, named 1.13.x, and release it every time that a
> number of bugfixes are introduced.

The decision was made to try this in a slightly different way,
by creating a freeciv-test project on sourceforge.

I don't know what the status of that attempt is.
> I think that this is not overkill for freeciv, as this would produce
> only a little more work for the maintainers, perhaps only one of them
> can be responsible to apply bugfixes patch to the stable branch.
> 
> Obviously, ONLY BUGFIXES, could be applied to the stable branch, and any
> new bug or bad behaviour that a patch introduce to the stable branch,
> has to be reversed.

This is the difference with the freeciv-test attempt, where the existing
tree already had much more than just bugfixes applied.

I don't think there has ever been such a "stable+bugfixes" release after
new features were intruduced into the current branch.
It would have been helpful to have one for 1.11.4, to fix the networking.
For 1.12.0, I don't know.

-- 
Reinier