[Scummvm-devel] New engine merging procedure proposal

[Max Horn]

Am 20.06.2011 um 10:19 schrieb Eugene Sandulenko:

> On 20 June 2011 11:16, Max Horn <max at quendi.de> wrote:
>>>> - Next I would like to see that every new engine needs a *public* OK from all
>>>> our team leaders. This should help in agreeing on a consensus.
>>> Yes, the team leader 'aye' was always the case since <ahem> RAW.
>> 
>> Hmm, to be strictly accurate: I did never say "aye" for dreamweb, I merely ceased brining up counter arguments. And I guess my wording gave the impression as if I was all roses and sunshine now (but in reality, I just wanted to stay perfectly friendly and not ruin everybody's dinner part). I think Johannes point is exactly that he wants an explicit "OK, merge this" from all leads. I think that's a good idea. If the team leads can't agree, they will have to sit down and see if they can work out a compromise.
> Well, I just had an impression of your 'OK' since you started to give
> out suggestions on how to improve the code and conversion.

Yes, I fully understand that my behavior seemed like I was "OK", and so let me emphasis that I am not trying to backpedal here, or claim that it was merged against my expressed will. Rather, I chose not to express my will, and to go along, since quite obviously you and some others were very strongly interested in merging this ASAP. In the past, I probably would have put up a longer discussion. So, in case it got across badly: I don't think you, Eugene, did anything wrong by considering me to have agreed.
Indeed, *I* chose consciously that I wasn't up for a discussion on this, and so started to try to at least get the code into a better shape. To my happiness, Vladimir very quickly responded to parts of my suggestion by implementing them. :)

But I still wanted to make it clear that there is a difference between "not speaking out against" and "inviting something in". 

> The place
> where those would take place in my opinion is irrelevant especially in
> the light of the fact that we're merging back the history.

Huh? Sorry, I don't understand this last sentence. What history are we merging where? Are you talking about the original dreamweb asm code?


Cheers,
Max