[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Error in TortoiseMerge(Malformed URL for repository)?

From: Maleki <jason.clarke.cameron_at_gmail.com>
Date: Wed, 16 Jul 2008 10:41:32 -0700 (PDT)

Ah thanks for the correction. Actually I noticed something... when I
did used the command line I omitted the --reintegrate. I re-ran it
and:

Error> svn merge http://mylocalmachine:8080/svn/Tutorial/branches/V1.3%20Release/HelloWorld.txt
C:\Storage\Data\SVNTutorial\trunk\HelloWorld.txt --reintegrate
Error> svn merge "http://mylocalmachine:8080/svn/Tutorial/branches/
V1.3 Release/HelloWorld.txt" C:\Storage\Data\SVNTutorial\trunk
\HelloWorld.txt --reintegrate

but

Ok>svn merge http://mylocalmachine:8080/svn/Tutorial/branches/V1.3%20Release/HelloWorld.txt
C:\Storage\Data\SVNTutorial\trunk\HelloWorld.txt
Ok>svn merge "http://mylocalmachine:8080/svn/Tutorial/branches/V1.3
Release/HelloWorld.txt" C:\Storage\Data\SVNTutorial\trunk
\HelloWorld.txt

both work ok.

M

On Jul 16, 1:28 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> Maleki wrote:
> > A couple of things to note:
>
> > -The problem seems to be a space in the URL that TortoiseMerge doesn't
> > handle.  I've tried replacing the space with %20 but no luck.
> > -I've also created another branch to test:
> > "http://mylocalmachine:8080/svn/Tutorial/branches/V1.4Release/Hello
> > World.txt"
> > This doesn't work in TortoiseMerge either.
>
> TortoiseMerge is the diff tool, it is not used at all for merges during
> a Subversion command. If TortoiseMerge is used, you would see a new app
> starting.
>
> Stefan
>
> --
>         ___
>    oo  // \\      "De Chelonian Mobile"
>   (_,\/ \_/ \     TortoiseSVN
>     \ \_/_\_/>    The coolest Interface to (Sub)Version Control
>     /_/   \_\    http://tortoisesvn.net
>
>  signature.asc
> 1KDownload

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-16 19:42:28 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.