Re: diff-docx.js

On 14.10.2011 16:44, Magnus Torfason wrote:
> Hi, this is a problem description and solution, although I haven't
> identified the root cause.
>
> I recently upgraded to TSVN 1.7-RC1. Later, I tried diffing a DOCX
> file. I thought I had diffed such files with earlier versions, but I
> definitely wouldn't swear by it (could have been DOC files).
>
> Anyway, I got the error message: Cannot find the Script file
> "c:\...\diff-docx.js"
>
> It pointed to my correct program location, so I checked that out and
> found that although it had a diff-doc.js file, there was no
> diff-docx.js file. I simply copied the diff-doc.js file to
> diff-docx.js file and now TSNV will happily diff such files.
>
> My problem is resolved, and I don't know if there was supposed to be
> a diff-docx.js file there. However, if not, this seems like a very
> low-effort way of extending this awesomely convenient functionality
> that I've been enjoying for my Word files for the new DOCX format.

You can fix this in the settings dialog:
Settings->external programs->diff viewer->advanced->restore defaults
and/or
Settings->external programs->merge tool->advanced->restore defaults

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2855262
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].