[Scummvm-devel] Memory consumption in GUI branch

[Vicent Marti]

Fine with me. I'm willing to take all the blame when the trunk gets  
trashed -- it's not like you actually know my *exact* location to bomb  
me or anything.

I went ahead and tried a Svnmerge on my local copy... It turned out  
rather bad because it showed conflicts on my own files (i.e. on files  
that are only on the GUI branch and not in trunk)...

I either did something wrong or SVNMerge is even worse than what I had  
expected. Any insight on this? I was hoping for a merge on Tuesday  
afternoon, after I get everything sorted out. Who's going to stand up  
and and do some watchful guidance (and some blame sharing, while we're  
at it)?

:)

Cheers,
Vicent.


On Oct 5, 2008, at 6:30 PM, Max Horn wrote:

>
> Am 05.10.2008 um 17:30 schrieb Johannes Schickel:
>
>>>> So here's the deal: If by October 12 (next week), nobody spoke up
>>>> *against* it, I propose we merge the GUI branch into trunk then.  
>>>> And
>>>> of course after that we'll happily collaborate with any and all
>>>> porters & testers reporting regressions of any kind, trying to fix
>>>> them.
>>>>
>>>> Deal?
>>> I do not see a problem if we would merge even now. The code looks
>>> _very_ solid and well-thought to me, so I am sure that we will use  
>>> it
>>> as the mainline. So why wait? Experience, especially from the last
>>> release (sigh) show that majority of the porters anyway will do  
>>> their
>>> work a week or less before the release, so we'd better try to  
>>> perform
>>> some testing and benchmarking on the desktops.
>>
>> Same opinion over here.
>
> Fine by me, as long as
> (a) I don't have to take all the shouts and cursing alone ;), and
> (b) somebody other than me does it (e.g. Vicent, under the watchful
> guidance of Johannes/Eugene).
>
> Bye,
> Max
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's  
> challenge
> Build the coolest Linux based applications with Moblin SDK & win  
> great prizes
> Grand prize is a trip for two to an Open Source event anywhere in  
> the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-devel