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

TortoiseMerge recognising some file as binary?

From: Jean-Francois Cote <jfcote_at_aquadata.com>
Date: Wed, 14 Dec 2011 06:22:44 -0800 (PST)


I'm proposing this as a bug since I didn't find any reason for TortoiseMerge to do that. This has been tested using TortoiseSVN 1.7.2 (Latest version)

-Click on a file, do "Show Log"
-Click on 2 particular revisions, in my case revision 107720 and 107623 and do "Compare Revision"
-TortoiseMerge will open and show a message "The file C:\Users\username\AppData\Local\Temp\chcon-rev107623.svn001.tmp.cpp is not a valid text file! Note that UTF32 files are treated as binary too."

This happend with some of the revision of this file, some not. I didn't find a pattern. This file is a valid text file. The file in the temp file is a normal ANSI c++ files.

More information:
-I tried the same steps using WinMerge plugin instead of TortoiseMerge (In visual studio 2010) and there is no problem, so it must be in TortoiseMerge.
-Strangely, the "Blame Revision" on the same 2 revisions works and it seems to use TortoiseMerge in the same way.
-Unified diff works too.

If you want any other information, just let me know. The only thing I can't provide is the code itself since it's confidential.


Jean-François Côté, ing.
Aqua Data inc.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-14 15:22:47 CET

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