[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: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-06-14 12:14:53 CEST

On 13/06/07, Swartzendruber, Jim <Jim.Swartzendruber@drs-ss.com> 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.

The inline diffing is word-based, and your hex line looks like one big
word. I suppose it could be yet another option in TortoiseMerge, but
we try to keep options to a minimum. The alternative is to pick a
different 3rd party diff tool, as Robert suggests.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jun 14 12:15:00 2007

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