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

Re: [TSVN] Couple of questions on TortoiseMerge

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-09-12 22:45:34 CEST

Brian Gangloff wrote:
> 1) Sometimes I will get a file, either download from my website or from
> a contribution (for example phpBB2 for my forums), and it will show as
> modified but when I "diff" it there aren't any differences? (I do have
> "Compare Whitespaces" checked, AND I have "Ignore Lineending
> (recommended)" check so THAT is probable my answer?).

That is very likely. Set the svn:eol-style property to 'native' to
minimise this sort of problem, especially when different line endings
are common.

> 2) Sometimes TortoiseMerge will pick the wrong line to compare, is there
> anyway to force TortoiseMerge to compare the correct lines. Here is an
> example
> Working Base
> - some long line of code (this line has been striked out)
> empty line
> Working Copy
> + some comment of change begin
> + some long line of code (compared to empty line)
> + Some comment of change end

If there is no difference in the long line of code, it should not show
as changed (unless there is a line-end difference). If there is a
difference, then TMerge just sees 1 line deleted and 3 lines added (take
a look at the unified diff output which Subversion supplies). It does
not attempt to re-align within the changed lines.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 12 22:45:43 2005

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