[Scummvm-devel] Memory consumption in GUI branch

[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.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?The second case should be easier to merge back to trunk,Cheers,Bertrand
--- En date de : Dim 5.10.08, Vicent Marti <tanoku at gmail.com> a écrit :
De: Vicent Marti <tanoku at gmail.com>
Objet: Re: [Scummvm-devel] Memory consumption in GUI branch

Hey Max,

I've followed those exact same steps (twice) and the result is a  
complete mess:

It looks like SVNMerge is merging all the revisions on my branch to  
the trunk *one by one*, so for instance in a file I've developed from  
scratch (like xmlparser.cpp), it first merges the first revision into  
trunk, and then merges the second one on top of it creating a conflict  
between them. The end result is that all the files I've written are  
full of conflicts between their different revisions up to a point that  
they cannot be manually fixed.

This is very strange indeed... Maybe I'm missing something obvious?  
Maybe I trashed my branch sometime during the GSoC? That would indeed  
suck.

Cheers,
Tanoku





      
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.scummvm.org/pipermail/scummvm-devel/attachments/20081006/fa3bb204/attachment.html>