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

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
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)

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)
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.

You can try it your self on
|svn checkout
https://jdbc-odbc-enhanced.dev.java.net/svn/jdbc-odbc-enhanced/trunk/bin/junit.log
jdbc-odbc-enhanced --username username

Regards,
Ulf

|
Received on Tue Jul 17 13:21:44 2007