[Scummvm-devel] svnmerge troubles

[Max Horn]

Hi there,

just found out that Chris' GSoC branch is partially broken, at least  
when it comes to merging. Something went wrong when doing the merge. I  
still don't know what, but I was able to work around this by manually  
setting the svnmerge-integrated property. Doing so I noticed that some  
of the other GSoC branches may have issues in the future, too.
On weird bit is that the gsoc2008-vkeybd branch has the svn:mergeinfo  
property, which is a SVN 1.5 feature. That should *not* be used

In order to figure out what went wrong here, can everybody who's using  
svnmerge on our repos please tell me:

1) What svnmerge version are you using, according to "svnmerge -- 
version" ? For me it is r31773, downloaded from
<http://www.orcaware.com/svn/wiki/Svnmerge.py> some time ago.

2) When you merge, do you just do
   svnmerge merge
from your branch, or do you specify a source URL or any other kind of  
options?



Bye,
Max