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

[TSVN] Custom Diff Inconsistent behavior

From: Stuart Altman <stuart.altman_at_corp.idt.net>
Date: 2005-04-01 17:33:30 CEST

Am using TortoiseSVN

Before changing anything, I noticed that I was able to use: TortoiseSVN->Diff
to compare two arbitrary text files that were NOT under source control.

I thought that it would be nice to be able to do the same thing with MS WORD
documents, so I added a "Diff Program" specifically for "doc" extensions.

(TortoiseSVN->Settings->Diff/Merge->Diff Program->Advanced):
doc "D:\Program Files\ComponentSoftware\CSDiff\CSDiff.exe" %base %mine

If I highlight two .doc files that are being SubVersioned and then right click
TortoiseSVN->Diff, then everything works as expected.

If I highlight two .doc files that are not being SubVersioned in a tree that
is not SubVersioned, and then right click TortoiseSVN->Diff, then I get the
following pop-up:

Title: "TortoiseMerge"
Text: The File C:\test\Word_Test_1.doc is not a valid text file!

This is a true statement (i.e. it's not a text file ... It's an MS WORD
document), but the wrong DIFF program is being invoked.

I tried the same repro after setting (as an experiment) the CSDiff.exe as
a "Diff/Merge->Diff Program->External" and it worked (but I don't want CSDiff
to DIFF my text or pdf files).

It's not unreasonable that the TortoiseSVN Custom DIFF only work with
SubVersioned files, but since the built-in DIFF works for arbitrary text
files, I thought it would be nice if the Custom DIFF work as well.

Thanks ... It's a beautiful product!

Please reply (I'm not on the mailing list)

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Apr 1 19:40:06 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.