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

Problem merging MS word document in TortoiseSVN 1.5.0

From: highnoon <thomas.mittag_at_gmail.com>
Date: Fri, 27 Jun 2008 11:39:06 -0700 (PDT)

I have just upgraded from TortioseSVN 1.4.8 to 1.5.0 and the conflict
resolution for MS Word documents stopped working. Rather than
launching Word it now tries to open the document in TortoiseMerge and
I am getting the error message:

      The File <file name> is not a valid text file!
      Note that UTF32 files are treated as binary too.

I checked the file merge-doc.js exists in the Diff-Scripts directory,
and in my registry I have the entry HKCU/Software/TortoiseSVN/
.doc wscript.exe "C:\Program Files\TortoiseSVN\Diff-Scripts\merge-
doc.js" %merged %theirs %mine %base //E:javascript

the script appears to work properly when launched from command line.

The diff script appears to work correctly from the TortoiseSVN menu as

Please help

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-27 20:44:34 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.