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

Bug in "edit conflict" and "diff" with ods file

From: poubelle poubelle <david10241024_at_gmail.com>
Date: Tue, 9 Oct 2012 23:07:48 +0200

Hi!

I found a bug in 2 script related.
The bug append when the path has a # in it under windows 7.

- extract a repository with a folder like c:\c#\repo\...
- try to do a "diff" on a an .ods file in the repository
- this leads to an IllegalArgumentException: URL seems to be an unsupported
one. in diff-odt.vbs
 - try to do a "edit conflict" on a an .ods file in the repository
 - this leads to an IllegalArgumentException: URL seems to be an
unsupported one. in merge-ods.vbs

solution:
the # must be replaced by %23 in the path to make it work.

i do the following change in the script diff-odt.vbs (change in red):

sBaseDoc=Replace(sBaseDoc, "\", "/")
sBaseDoc=Replace(sBaseDoc, ":", "|")
sBaseDoc=Replace(sBaseDoc, "%", "%25")
sBaseDoc=Replace(sBaseDoc, " ", "%20")
*sBaseDoc=Replace(sBaseDoc, "#", "%23")*
sBaseDoc="file:///"&sBaseDoc
sBaseDoc=objUriTranslator.translateToInternal(sBaseDoc)
sNewDoc=Replace(sNewDoc, "\", "/")
sNewDoc=Replace(sNewDoc, ":", "|")
sNewDoc=Replace(sNewDoc, "%", "%25")
sNewDoc=Replace(sNewDoc, " ", "%20")
*sNewDoc=Replace(sNewDoc, "#", "%23")*

 i do the following change in the script merge-ods.vbs (change in red):

sMyDoc=Replace(sMyDoc, "\", "/")
sMyDoc=Replace(sMyDoc, ":", "|")
sMyDoc=Replace(sMyDoc, "%", "%25")
sMyDoc=Replace(sMyDoc, " ", "%20")
*sMyDoc=Replace(sMyDoc, "#", "%23")*
sMyDoc="file:///"&sMyDoc
sTheirDoc=Replace(sTheirDoc, "\", "/")
sTheirDoc=Replace(sTheirDoc, ":", "|")
sTheirDoc=Replace(sTheirDoc, "%", "%25")
sTheirDoc=Replace(sTheirDoc, " ", "%20")
*sTheirDoc=Replace(sTheirDoc, "#", "%23")*

Version : TortoiseSVN 1.7.10, Build 23359 - 64 Bit

I hope that will help you

David

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3019271

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-10-09 23:12:31 CEST

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