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

Re: TSVN Bug

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 18 Jul 2008 18:00:48 +0200

> This bug involves the selection of the correct external merge tool. I
> have verified that the included merge-doc.js script exists and is
> specified in the program column for advanced merge settings extension
> .doc. I have also verified that the correct entry exists in the 'Merge
> Tools' location in the Windows registry.
> I select 'Edit conflicts' from the TSVN menu for a conflicted .doc file.
> Based on the setting for external merge tool for .doc type files, I
> would expect the merge-doc.js to execute and start MS Word to edit the
> conflicts.
> However, the merge-doc.js script does not appear to be executed at all.
> Instead, TSVN chooses TortoiseMerge as the merge tool (which, of course
> returns the '<filename> is not a valid text file!' error). Any info on
> whether or not this is a known bug and/or being addressed would be
> greatly appreciated.

It's not enough to simply specify the script. How would TSVN know what
type of script it is?
You have to specify the application which actually runs the script:

wscript.exe "C:\Program Files\TortoiseSVN\Diff-Scripts\diff-doc.js"
%base %mine //E:javascript


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-18 18:01:06 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.