Re: Problem merging MS word document in TortoiseSVN 1.5.0
> 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-
> the script appears to work properly when launched from command line.
> The diff script appears to work correctly from the TortoiseSVN menu as
This is because the filenames passed from the merge conflict resolve
callback don't have the file extension of the original file. The
diff/merge tool to use is chosen based on that extension.
I've implemented some workaround in r13365, but it won't work in all
cases (but it will in most).
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-06-27 21:31:56 CEST
This is an archived mail posted to the TortoiseSVN Users