On Fri, Jan 20, 2012 at 12:49 PM, Christian Ohm <chrxxxx...@gmx.net> wrote:
> So, ehm, do we have a plan for 3.1? From my suggestion:
> - Scrap the current 3.0.
> - Update mingw-cross-env to sdl 1.2.15.
> - Integrate quesoglc.
> - Make a new 201201xx snapshot.
> - Possibly fix stuff.
> We are currently here. Is the template/hq stuff now fixed in git (or
> could it be done in the scripts now)? Or should we revert the changes
> for 3.1 and keep them only for master?
> Anything else that needs to be done? Are Safety0ff's buffer swap and
> vexed's lobby patches final?

The lobby patch works as intended, but, the backend infrastructure
needs to be fixed.
The last time I tried Safety0ff's patch, it did fix the issues I saw/had.

> - Possibly wait for the official sdl 1.2.15.

It is out.

> Maybe we don't have to wait for that...
> - Then branch 3.1, and do a beta1 release immediately.
> And for this, git-flow or the old way? A properly done git-flow has the
> advantage of commit hashes being the same in different branches, making
> changelog writing easier. If we keep the old way, I guess I'll only do
> it for 3.1, not master.

I am not sure what needs to be done, we keep doing commits (bug fixes)
to master like always, and have new features in their own branch, and
then finally merge that back into master and remove that branch.
If so, that could be quite the challenge trying to get everyone on the
same page, and up to speed.
It becomes hellish switching to new branches because of compiler cache
files and there is currently no way for git to 'pack up' these files
when you switch to the new branch, so things become clobbered.
Anyway, the main thing about this is, that we are a very small group,
and I just don't see people creating feature branches for the heck of
it, since most of us just work locally, and when done, we either throw
a patch on trac, or just commit it anyway.  The only exception to this
would be if they are going to alter Warzone in a way that most people
wouldn't like, so for major changes, that needs to be in a branch.

Since you already made 3.1, I just want to make sure we are clear on
how we will handle this going forward.
Namely, once we start up on the 'beta cycle', there will be no new
features allowed, it will be locked down, and only bug fixes are

In the meantime, those same bug fixes were already applied to master
(and whatever feature branch the person is currently working on--and
don't forget to rebase once you pull all the changes down from

On Fri, Jan 20, 2012 at 1:54 PM, Christian Ohm <chr.xxxxxxxxx...@gmx.net> wrote:
> On Friday, 20 January 2012 at 13:39, dak180 wrote:
>> I would prefer to wait for that for three reasons:
> I don't think it's necessary for a beta, if we get to that before the
> SDL release, and any rc/final will be after that anyway.

Eh ? where did this come from, I see no mail from dak180 anyplace, so
no idea what the context of this was.

Warzone-dev mailing list

Reply via email to