[Scummvm-devel] svnmerge troubles

[Max Horn]

Am 02.08.2008 um 22:07 schrieb Stephen Kennedy:

> Hi Max,
>
> 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.

Probably a good idea in any case :)

>
>
> Also when I simply do "svnmerge merge" I get the following message:
>
> svnmerge: multiple sources found. Explicit source argument (-S/-- 
> source)
> required.
> The merge sources available are:
>  /scummvm/trunk
>  /scummvm/branches/gsoc2008-rtl
>  /scummvm/branches/gsoc2008-tfmx
>  /scummvm/branches/gsoc2008-gui
>
> So in order to merge I have to do "svnmerge merge -S /scummvm/trunk".

Yeah, this happened in Chris' branch as well, only there the /scummvm/ 
trunk was gone! So we'll have to manually tell svnmerge which  
revisions were already merged.


>
>
> 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?

Should be safe, aye.


Bye,
Max