[Scummvm-devel] Merging the GUI branch

[Max Horn]

Am Mi, 8.10.2008, 14:39, schrieb Vicent Marti:
> Greetings people, thanks for pointing out all this.
>
> Begasus: The files that fail to be patched are the ones who should be
> removed from the build altogether, but that somehow "svn diff" doesn't
> properly define as deleted in the patch file. These can be safely
> ignored, they aren't compiled at all if you are building with the
> Makefile.

FYI, the diff format (which includes the output of "svn diff", the
standard "diff" tool, etc.) does not allow to specify that a file has been
deleted, or moved. Which is why output of "svn diff" in general is not a
great way to peform branch merges, because e.g. it looses the history of
file moves; it also can not cope with the following scenario: you add a
file foo.c, then delete foo.c, then add a new file with the new name. If
you do that in your branch, this history gets lost when you perform a
merge using a simple patch generated by "svn diff"; worse, you can get
weird errors, similiar to what you are actually getting in your failed
merge attempts..


This is why in general, "svn merge" and/or "svnmerge.py" are superios when
doing merges. Except for nasty bugs *sigh*.

Anyway: You can *not* capture the full essence of all changes on a merge
with a simple "svn diff" generated patch file. Period.

Tanoku, if you renamed any files in your branch, then I'd be glad if you
could try to emulate that when applyiny your changes to trunk. So, if you
renamed a file A to B in your branch, then do this:

 1) go to the trunk dir
 2) svn mv A B
 3) now apply your patch
 4) commit

Note that committing is the last step, i.e. don't rename, commit, patch,
commit -- do it in one step.

>
> Regarding the lack of the modern theme when launching the port: The
> theme filenames have changed in the new GUI. Make sure that you have
> the "scummodern.zip" file somewhere where the executable can access it
> (e.g. same folder as the exe or in the themes path that you defined on
> the settings) and then remove your old scummvm.ini or just manually
> select the modern theme from the options menu. It will load
> automatically from there on.
>
> I have just added a small hotfix which will automatically set ScummVM
> to use the new modern theme if it finds a reference to the old theme
> on the ini file.

Actually, we might want to consider changing the way we reference themes
in the config file... (using just a file basename, w/o extension and path
details, means but that's another matter.

>
> md5: I have fixed most of your nitpicks. I do believe that the removal
> of drawing hints in all files is correct, since most of them were
> superfluous because of default values. I'll look into it more
> carefully. Unfortunately, I don't have access to a Windows computer
> right now, and I can't run batch files on my MacBook. Hopefully a kind
> soul will update the MSVS solutions once the merge is in place.

Actually, it would be nice if somebody wrote a Perl script which just
generates all MSVC files from our module.mk files. It looks simple enough
:)



Cheers,
Max