[Scummvm-devel] SVN branch merging: Use "svn merge", not svnmerge.py

[Max Horn]

Hi folks,

I just noticed that some of our SVN branches now use SVN's "svn merge"  
command (available in this form since 1.5) to merge branches; but some  
still use svnmerge.py (esp. Kirben seems to still use it ;).

It would be better if we used "svn merge" everywhere. There is a  
conversion tool for that: <http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py 
 >. The development of "svnmerge.py has been stopped, I think.

Refer to the SVN book for details on its branch merging features: <http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html 
 >


Cheers,
Max