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

[Bug] View diffs for Office files in paths containing spaces

From: Alexander Kriegisch <alexander_at_kriegisch.name>
Date: Fri, 12 Apr 2013 14:09:11 +0200 (CEST)

I have notices that in TortoiseSVN the VBS scripts which do the diff magic for MS Office files the file name variables "%base" and "%mine" in script calls in "advanced diff settings" need to be quoted in order to make the visual diff work with path or file names containing white space. I played around with different stales of quoting and logging the results in diff-xls.vbs and found out how to change the comman line to make it work.

Wrong (currently found in TortoiseSVN):
wscript.exe "C:\Program Files\TortoiseSVN\Diff-Scripts\diff-xls.vbs" %base %mine //E:vbscript

Correct:
wscript.exe "C:\Program Files\TortoiseSVN\Diff-Scripts\diff-xls.vbs" ""%base"" ""%mine"" //E:vbscript

Please not that we need double double-quotes here (no pun intended) in order to make this work in VBS, otherwise the command line tokeniser there gets confused.

Please update this in all relevant wscript.exe calls and also for other calls to external diff tools like WinMerge, where applicable.

Thank you

-- 
Alexander Kriegisch
http://scrum-master.de
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3053139
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Fix_Office_diffs_with_spaces_in_paths.png
Received on 2013-04-12 14:15:28 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.