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

[Max Horn]

Am 01.06.2011 um 17:10 schrieb Marcus Comstedt:

> 
> Max Horn <max at quendi.de> writes:
> 
>> What I liked about the merge: I made this mistake of merging the Android jni.cpp "#if 0" change. Fuzzie told that it was meant for stable only.  I wanted to verify this (not that I was doubting fuzzie, but I was curious). Since it was a merge, "git blame" immediately told me the commit the change came from, the full commit log, and so everything was clear. I am pretty sure this wouldn't have been possible with SVN (and it wouldn't have been possible if I hadn't done this as a merge commit).
> 
> I don't quite get the last parenthesis.  If you had
> cherry-picked/rebased the commit to master instead of merging, then
> git blame wouldn't have shown you the commit on the release branch,
> but it would have shown you an identical commit with the same author
> and log message, so everything would have been just as clear, no?

Sorry, I was being unclear (partly because I inserted the stuff about cherry picks *after* writing the final sentence, I guess ;): To explain, I was contrasting "merge commit" here with "SVN style", i.e.  commiting the accumulated differences in one 'normal' commit with only one parent. Of course if I had cherry picked individual commits, that would also have left the history clear.

While I am at it: What I would have disliked about manually cherry picking from the release branch to stable:
(a) I would have to find all relevant commits manually (not *that* much work with git, but still considerably more work than what I had to invest now). 
(b) Since I would have transplanted commits of people, taking them out of context, there is a fair likelihood for messing something up (esp. for a multi-commit series). E.g. if I forgot one of five commmits, then this is not visible in the history; but "git blame" would lead to the original author. 

In other words, I feel using cherry pick here would be more work and easier to screw up (I mean, I already managed to screw up with the easy "merge", now you can imagine how bad it would have been with cherry picking...)


Cheers,
Max