Re: [Freeciv-Dev] S2_5 branching

2013-05-01 Thread Marko Lindqvist
On 28 April 2013 18:47, Marko Lindqvist cazf...@gmail.com wrote: We're just a couple of days from branching S2_5 02-May. My timezone is EEST (UTC +3), and I'm about start the branching activities as soon as clock hits 00:00 here. So for you in western Europe, let alone in Americas, it will be

[Freeciv-Dev] S2_5 branching

2013-04-28 Thread Marko Lindqvist
We're just a couple of days from branching S2_5 02-May. My timezone is EEST (UTC +3), and I'm about start the branching activities as soon as clock hits 00:00 here. So for you in western Europe, let alone in Americas, it will be still 01-May. After the bracnhing we will have four active branches:

[Freeciv-Dev] S2_5 branching

2013-04-02 Thread Marko Lindqvist
As it's 30 days to S2_5 branching, my take on new feature patches coming in will now on be that they get targeted to 2.6 unless: - It complements 2.5 feature (already committed or agreed about) OR - It's very low impact: almost trivial = not bugprone, not increasing requirements in a significant

Re: [Freeciv-Dev] S2_5 branching

2013-04-02 Thread Emmet Hikory
On Tue, Apr 02, 2013 at 03:37PM +0300, Marko Lindqvist wrote: As it's 30 days to S2_5 branching, my take on new feature patches coming in will now on be that they get targeted to 2.6 unless: - It complements 2.5 feature (already committed or agreed about) OR - It's very low impact: almost

Re: [Freeciv-Dev] S2_5 branching

2013-04-02 Thread Marko Lindqvist
On 2 April 2013 17:40, Emmet Hikory per...@shipstone.jp wrote: On Tue, Apr 02, 2013 at 03:37PM +0300, Marko Lindqvist wrote: As it's 30 days to S2_5 branching, my take on new feature patches coming in will now on be that they get targeted to 2.6 unless: - It complements 2.5 feature

[Freeciv-Dev] S2_5 branching

2013-03-24 Thread Marko Lindqvist
It's a bit over month until planned S2_5 branching date of 02-May. This time we are not going to cut down all feature development in stable branch as soon as it's created. New 2.5 features will still be added in S2_5. Reason for braching is just to cut down more random features from getting in,