[Scummvm-devel] Memory consumption in GUI branch

[Max Horn]

Am 06.10.2008 um 10:15 schrieb Bertrand Augereau:

> Hi guys,
>
>
> Subversion merging is notoriously weird.
>
> The new merge tracking features are a complete mess, that's why many  
> people are going to git or mercurial or whatever with sane merging.
>
> The new merge tracking features seemed to be a good idea, but it is  
> very new and has lots of flaws.
>

Well, since we are *not* using the new SVN merge tracking features  
from SVN 1.5 (mainly since SF.net is still running SVN 1.4 :), this is  
moot. Rather, we are using  and talking about the svnmerge.py tool.

> First question : did you merge recent modifications in the trunk in  
> your branch, or has this branch diverged from a common point without  
> gathering trunk patches?

It has been merged at recent intervals, and is almost completely up-to- 
date. Which Tanoku actually wrote in the mail you replied to  
(indirectly, though, he said he followed the instructions I gave him ;)

> The second case should be easier to merge back to trunk,

Indeed. That's why I already suggested it a few mails ago in this  
thread :). I recommend oyu read up on the thread (and check the recent  
commit mails, e.g. for rev 34752).


Cheers,
Max