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

TSVN Bug

From: MARICH, DAVID CIV DFAS <DAVID.MARICH_at_DFAS.MIL>
Date: Fri, 18 Jul 2008 11:27:56 -0400

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.

I am not subscribing to the mailing list, so please respond to me
directly also. Thanks.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-18 17:34:36 CEST

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