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

Re: Enhancement: expressiveness of the diff view on differing EOL markers

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-07-17 19:42:34 CEST

Ulf Zibis wrote:
> Am 16.07.2007 10:27, Simon Large schrieb:
>> Have you tried the nightly build? The status bar there tells you what
>> the EOL style is.
> Now I've tried it: 1.4.99, Build 10120 - 32 Bit -dev, 2007/07/15 23:11:02
> TSVN Issue Diff view CRLF.jpg
> As you see in the screen shot, I've marked line 12 which has divergent
> content.
> 1.) inline-changes are not coloured

Yes, the inline diff sometimes doesn't show. That's because
TortoiseMerge doesn't show it if there are too many changes or too small
ones. Believe me: it's better that way. You could end up with sometimes
every other char in a different color.

> 2.) I updated my working copy by "Use this text block"
> 2a.) by the way, "Redo" doesn't remove the '*' for the right file, but
> add's a 2nd on the left side
> indicate if the files are modified (as to speak about common behaviour)

Fixed in revision 10152.

> TSVN Issue Diff view CRLF_2.jpg
> 3.) after save and reload I have this:
> TSVN Issue Diff view CRLF_3.jpg
> 4.) Instead of only updating line 12, TMerge changes all the EOLs
> (quaintly from line 4)

Yes, TortoiseMerge saves the file with *consistent* line endings.
That's not a bug, that's by design.

> 5). As you see in the screen shot, I've marked line 12 which has
> divergent EOLs. As your status line says ASCII LF for both sides, I
> can't see if the wrong EOL marker is in working copy, or working base.

Use a more recent nightly build. There you can see the EOL's (if you
turn on "show whitespaces").


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 17 19:41:45 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.