[Scummvm-devel] Towards a new release branch model

[A. Milburn]

On Tue, May 31, 2011 at 06:20:11PM +0200, Miguel Bernabeu wrote:
> not). At the same time we are working in new stuff on "master" _but_not_
> bugfixing "master". Now we rebase "stable" changes onto "master", so the
> quick fix is applied to "master" and a thorough fix can be applied later,
> without reverting the quick fix, simply a modifying commit.

I worry that this is rather unrealistic given the nature of a lot of the quick
fixes which get applied to stable branches - they're the *wrong* fix and
people are going to want to revert them right away. As well as the situation
with fixes which are irrelevant/wrong for master because other code changed
and/or was refactored from underneath them.

But I am generally concerned about the fact that various people have
obviously been struggling with git since the move, and the possibility that
- even without feature branches etc - mandating a development model like this
will make people more frustrated with it and less motivated to actually fix
things. Would be nice to have some feedback from such developers, to know if
I'm just imagining things or not..

- fuzzie