[Scummvm-devel] svnmerge troubles
djkennyd at googlemail.com
Sat Aug 2 22:07:01 CEST 2008
I've been forced to work on Windows recently (due to my wireless card
not working under linux), and because I did not have Python installed I
just downloaded the svnmerge.exe windows executable from orcaware.com.
When I do "svnmerge --version" it tells me its r29854. This appears to
be pretty out of date, so I guess it would be a good idea for me to
install Python and get the latest version of svnmerge.
Also when I simply do "svnmerge merge" I get the following message:
svnmerge: multiple sources found. Explicit source argument (-S/--source)
The merge sources available are:
So in order to merge I have to do "svnmerge merge -S /scummvm/trunk".
But in terms of the svn:mergeinfo property thats on my branch, i'm not
sure exactly why its there. Will it be safe to simply delete it?
Max Horn wrote:
> 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
> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
> Build the coolest Linux based applications with Moblin SDK & win great prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
More information about the Scummvm-devel