[Scummvm-cvs-logs] SF.net SVN: scummvm: [31982] scummvm/branches/gsoc2008-tfmx/engines/gob

[Max Horn]

Am 10.05.2008 um 23:08 schrieb Eugene Sandulenko:

> On Sat, 10 May 2008 11:51:26 -0700
> marwanhilmi at users.sourceforge.net wrote:
>
>> Revision: 31982
>>           http://scummvm.svn.sourceforge.net/scummvm/? 
>> rev=31982&view=rev
>> Author:   marwanhilmi
>> Date:     2008-05-10 11:51:25 -0700 (Sat, 10 May 2008)
>>
>> Log Message:
>> -----------
>> Updates to GobEngine taken from trunk.
> May I ask you did you talk to your mentor before doing this? Basically
> you killed svnmerge utility by this, and I think it will be much  
> harder
> to merge your branch in the future.

I guess it was a honest mistake. I already discussed this with Marwan  
in private, and he will use svnmerge from now on. I think the tool is  
pretty new to us, so little mistakes simply will happen :-).

In this particular case, it will be possible with some work to "fix"  
the merge structure for svnmerge, with some manual effort. I would  
recommend that Marwan tries to do this -- i.e. svnmerge the trunk  
into this branch, fixing any merge problems caused by this particular  
commit ;-).

Cheers,
Max