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

Re: TortoiseSVN bug: compare Open Office documents fails when filename contains spaces

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-02 17:23:28 CEST

Jonathan Ashley wrote:
> I have a work-around for this now; the following change to the diff-odt
> script
> fixes the symptoms of the problem:
>
> --- diff-odt.vbs 2007-02-19 19:38:24.000000000 +0000
> +++ diff-odt.vbs 2007-10-02 07:56:48.393291000 +0100
> @@ -48,11 +48,13 @@
> 'Adjust the paths for OO
> sBaseDoc=Replace(sBaseDoc, "\", "/")
> sBaseDoc=Replace(sBaseDoc, ":", "|")
> +sBaseDoc=Replace(sBaseDoc, "%", "%25")
> sBaseDoc=Replace(sBaseDoc, " ", "%20")
> sBaseDoc="file:///"&sBaseDoc
> sBaseDoc=objUriTranslator.translateToInternal(sBaseDoc)
> sNewDoc=Replace(sNewDoc, "\", "/")
> sNewDoc=Replace(sNewDoc, ":", "|")
> +sNewDoc=Replace(sNewDoc, "%", "%25")
> sNewDoc=Replace(sNewDoc, " ", "%20")
> sNewDoc="file:///"&sNewDoc
> sNewDoc=objUriTranslator.translateToInternal(sNewDoc)
>
> It's not really the right thing to do - I think the real fix is to stop
> Tortoise
> from saving the name with spaces converted to '%20' in the first place -
> but it
> works for me.

Thanks for the patch.
Committed in revision 10845.

But the scripts still must work with paths that have '%XX' in them:
those are perfectly legal paths.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 2 17:23:40 2007

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