[Scummvm-devel] Merging the GUI branch

[Vicent Marti]

Hello gentlemen:

Since nobody has complained about the patch in the last 36h, I'm gonna
assume it *is* working (it seems to work pretty well over here,
anyways), and will commit the GUI merge to the trunk this evening;
that is, unless someone has any last minute objections.

You'll be able to find me on IRC when the trunk is totally trashed.

Cheers,

Vicent Martí
----------------
http://www.smartlikearoboc.com



On Mon, Oct 6, 2008 at 7:32 PM, Vicent Marti <tanoku at gmail.com> wrote:
> Ah, the magical wonders of Subversion!! "Version control done right", they
> said.
>
> Ok, on topic, the merge is ready and sitting on my hard disk. I've compiled,
> done playtesting, ran all unit tests (pointless, I didn't even touch the
> common code that is tested, but whatever), removed the old unused files, set
> the svnprops and summoned the holy gods of the SVN branches to look over me.
>
> Attached is a SVN diff that should turn an up-to-date checkout of the trunk
> into using the new GUI, hopefully without breaking anything. Apparently
> Subversion is set to suck today, so the patch doesn't really remove the old
> unused files (which are manually removed with svn rm on my local
> repository).
>
> Whatever, after applying that patch those files are just ignored on compile
> time, so... There goes the 24h countdown; I'm hoping that Max (and hopefully
> some more awesome peeps) can apply the patch before tomorrow and make sure
> it doesn't trash their branch.
>
>
>
>
>
>
>
> On Oct 6, 2008, at 2:25 PM, Max Horn wrote:
>
>> Vicent,
>>
>> I can reproduce your merge problems. Very weird indeed. No idea what
>> is causing them. Nor how to fix it...
>>
>> Instead of wasting time trying to figure this one out, I propose that
>> we instead perform a manual merge. This should be fine given that your
>> changes are restricted to a small number of files:
>>
>> Most stuff in gui/, as well as these (according to svnmerge's failed
>> merge attempt):
>>
>> C      dists/msvc9/scumm.vcproj
>> C      dists/msvc9/scummvm.vcproj
>> C      engines/scumm/dialogs.cpp
>> C      engines/drascula/talk.cpp
>> C      engines/dialogs.cpp
>> C      engines/parallaction/saveload.cpp
>> M      engines/parallaction/objects.h
>> C      common/unzip.cpp
>> M      common/module.mk
>> C  +   common/xmlparser.cpp
>> M      common/rect.h
>> C  +   common/xmlparser.h
>> A  +   graphics/VectorRenderer.h
>> A  +   graphics/VectorRendererSpec.h
>> C      graphics/module.mk
>> A  +   graphics/VectorRenderer.cpp
>> A  +   graphics/VectorRendererSpec.cpp
>> M      graphics/font.cpp
>> M      base/main.cpp
>>
>>
>> Assuming that your repos is synced with latest trunk, a manual merge
>> could be as simple as "copy all modified files over to trunk, svn add
>> new files, svn rm obsolete files". Then of course some test runs,
>> maybe eyeballing of the "svn diff", and then just commit it...
>>
>>
>> Cheers,
>> 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
>
>
>