[Scummvm-devel] git force-push

[Johannes Schickel]

> Well, if one follows the pure git / DVCS ideology, then more squashing and
> rebasing is evil, and we should preserve the true development history as
> closely as possible... :) Actually, this stance does have some merits. If
> one rebases and squashes a lot, then there is always a risk of producing a
> history with many intermediate revisions that are broken in various ways
> (e.g. they don't compile).
> 
> So, for this particular large series of commits, it might actually be best
> if the original commits were merged, instead of doing lots of rebasing and
> squashing. Alas, I am not sure if that history is still available...
> 
> 

I mostly agree with this. But that "detune" change was really messy, since the 
partial revert later on included decreasing the savegame format version number 
for SCUMM. So in theory we would include commits which could create/process 
possibly incorrect savegames (due to later commits really utilising a "proper" 
version 85 of the save format), probably that's even more annoying for 
regression testing than without it.

// Johannes