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

[Max Horn]

Am 18.07.2009 um 12:59 schrieb Travis Howell:

> Max Horn wrote:
>> 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 
>> >
>
> The guidelines ( at
> http://wiki.scummvm.org/index.php/Summer_of_Code/Students_Guidelines )
> for GSoC students on the wiki, still mention the svnmerge.py script,  
> at
> the recommended SVN merge method.

Ah, I didn't even know we documented it there -- so the Wiki should be  
updated :)

Cheers,
Max