[Scummvm-devel] Merging the GUI branch

[Max Horn]

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