DiffMerge compared to SOS Diff Tool

Support for our DiffMerge utility.

Moderator: SourceGear

Post Reply
aksel
Posts: 16
Joined: Fri Dec 17, 2004 6:56 am

DiffMerge compared to SOS Diff Tool

Post by aksel » Wed Aug 29, 2007 7:32 am

Hey guys. I've been trying to use the new DiffMerge in place of the built-in tool from SOS and am running into the following problem:

With SOS, if a file has some binary characters in it, it recognizes them and then continues to identify differences.

With DiffMerge, if a file has binary, it STOPS at the first binary file.

I was looking for differences between two files, with SOS, it showed 1500 lines, with DiffMerge it only showed 500 lines.

What was the clue? There was a binary char on line 501.

Any ideas what's up with that or is that something that could be fixed in an update?

Thanks!

jeffhostetler
Posts: 534
Joined: Tue Jun 05, 2007 11:37 am
Location: SourceGear
Contact:

was the binary character a null?

Post by jeffhostetler » Wed Aug 29, 2007 7:58 am

without seeing your file, i'll have to make a few guesses:

[1] was the first binary character a NULL (0x00)? there's an errant
strlen() in the import code which could cause what you're seeing.

[2] what is the character encoding setting in the ruleset that is being
used for the file? most of the rulesets default to ISO-8859-1 (Latin-1).
is it possible that the character isn't defined in that encoding? maybe
switch the ruleset to something like windows-1252 and see if that helps.

if you want to extract say 10 lines of the file, zip it, and send it to the
email address below, i'll take a look at it.

thanks
j

Post Reply