[Scummvm-devel] Towards a new release branch model

[Max Horn]

Am 30.05.2011 um 23:31 schrieb Marcus Comstedt:

> 
> Hi Max,
> 
> I think you skipped over the most important point in fuzzie's questions:
> How do we handle bugs which get "quick fixes" on the release branch,
> and more thorough fixes on "trunk".  Do we immediately merge the quick
> fix and then revert it ("reverse cherry-picking") before making the
> thorough fix, or do we make the fixes in parallel and get a conflict
> when later merging the quick fix (or worse, _not_ getting a conflict
> and potentially have two fixes for the same thing)?

Good question. I have no good answer ready right now, but apparently, the git team itself somehow deals with it. So it would be a good idea to find out. E.g. somebody could ask them.


> Btw, if everything from release branches get merged back, then you
> can't put "releasification" things on release branches (for example
> disabling of serial port output in the DC port),so such things need
> to be controlled by --enable-release instead.

Having this automatically done when --enable-release is used sounds like a much better way than doing it manually during every release cycle. Makes it less likely that it's forgotten.

>  I seem to recall there
> were some problems with using this flag for additional things, but
> maybe that's been fixed with the restructuring of the configure
> script?

I wasn't aware that there ever was a problem with that, nor do I see one now.

Bye,
Max