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

Re: Tortoisemerge: Does not display differences in long character strings

From: Robert Roessler <robertr_at_rftp.com>
Date: 2007-06-13 20:44:37 CEST

Swartzendruber, Jim wrote:
> I use TortoiseSVN for complete project SCM, including Motorola S-Record files.
> My issue is with using TortoiseMerge on Motorola S-Record files, where the
> entire line is highlighted as General Removed/Added, but the Inline differences
> are not displayed.
>
> Example: one line from my PROM.hex:
>
> PROM.hex: Working Base
> S2250168C7590010000300100080021000C3001000300C41012C640000F80C4100326400007A66
>
> PROM.hex: Working Copy
> S2250168C7590010000300100080021000C3001000380C41012C640000F80C4100326400007A5E
>
>
> I was hoping to see the following inline differences
> Changed From Bytes: v vv
> S2250168C7590010000300100080021000C3001000300C41012C640000F80C4100326400007A66
> S2250168C7590010000300100080021000C3001000380C41012C640000F80C4100326400007A5E
> Changed To Bytes: ^ ^^
>
>
> I've updated to the latest public release (v1.4.4 build 9706) and looked in
> Changelog/IssueTracker/MailingLists for any recent mention.

AFAICT, there is no option on TortoiseMerge to enable the difference
display you would like (however I am not an expert)...

... BUT, WinMerge, which is an option if you just need diffing and not
merging, can come closer if you set an "Editor" option for "Line
Difference Coloring" to "Character level". Then the diff pane shows
coloring from the initial mismatch ("0" and "8") *through* the final
mismatch ("66" and "5E").

Robert Roessler
robertr@rftp.com
http://www.rftp.com

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Jun 13 20:45:25 2007

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