[Scummvm-devel] Merged branch-1-3-0 into master

[A. Milburn]

On Wed, Jun 01, 2011 at 03:42:20PM +0200, Max Horn wrote:
> I *hope* that I didn't mess up anything this time around, I really tried hard, but please everybody review and test this.

I'm a bit surprised this was pushed without review, given I've been
expressing my concerns about it on-list.. we've gained an Android
commit labelled stable-only and a nasty engine-specific hack for
the DS, which is the kind of thing I am worried about (and the
RELEASE_BUILD issue which you've already fixed). None of these are
a big deal, of course, and as you say we have a lot of eyes to keep
a look out.

> For the PS2 and Dreamcast ports, there were changes that looked like they were meant only for the release builds. I moved this into commented out lines, with a comment "For release builds:" next to them.

But if the goal of this branching system is really to make history clearer,
this kind of merging does not have that effect, imo - we now have a bunch
of changes 'hidden' inside a merge commit.

I don't think this is anything to do with how you did it, but simply my
issues with doing these stable->master merges at all. I really worry that
we're going to encourage nasty hacks - which are only committed due to the
need to have things work for the stable release - being committed to master
because it's the 'right way' to do it (since simply reverting these fixes
seems to be advised against?), and that we're going to end up with
unclear history because the only way to keep master relatively sane is to
make a bunch of modifications in the merge commit itself.

Having tried this and so being able to see the concrete results is a good
way to actually see what the effects of these merges would be, though.

- fuzzie