Package: tkdiff Version: 1:4.1.3-1 Severity: normal *** Please type your report below this line ***
If every line of a file ends in CR LF (DOS line endings), but a
deleted section includes an extra CR, then the left and right file
displays are thrown out of alignment. Apparently diff counts LFs but
(in the display) tkdiff counts CRs.
Here are hexdumps of files that reproduce this:
"before"
0 31 20 73 61 6d 65 0d 0a 32 20 73 61 6d 65 0d 0a 1 same..2
same..
16 33 20 73 61 6d 65 0d 0a 34 20 6c 69 6e 65 20 65 3 same..4
line e
32 6e 64 69 6e 67 20 69 6e 20 74 77 6f 20 63 61 72 nding in
two car
48 72 69 61 67 65 20 72 65 74 75 72 6e 73 20 0d 0d riage
returns ..
64 0a 35 20 73 61 6d 65 0d 0a 36 20 62 65 66 6f 72 .5 same..6
befor
80 65 0d 0a 37 20 73 61 6d 65 0d 0a 38 20 73 61 6d e..7
same..8 sam
96 65 0d 0a 39 20 62 65 66 6f 72 65 0d 0a 31 30 20 e..9
before..10
112 73 61 6d 65 0d 0a 31 31 20 73 61 6d 65 0d 0a 31 same..11
same..1
128 32 20 62 65 66 6f 72 65 0d 0a 31 33 20 73 61 6d 2
before..13 sam
144 65 0d 0a e..
"after"
0 31 20 73 61 6d 65 0d 0a 32 20 73 61 6d 65 0d 0a 1 same..2
same..
16 33 20 73 61 6d 65 0d 0a 35 20 73 61 6d 65 0d 0a 3 same..5
same..
32 36 20 61 66 74 65 72 0d 0a 37 20 73 61 6d 65 0d 6 after..7
same.
48 0a 38 20 73 61 6d 65 0d 0a 39 20 61 66 74 65 72 .8 same..9
after
64 0d 0a 31 30 20 73 61 6d 65 0d 0a 31 31 20 73 61 ..10
same..11 sa
80 6d 65 0d 0a 31 32 20 61 66 74 65 72 0d 0a 31 33 me..12
after..13
96 20 73 61 6d 65 0d 0a same..
(I'm trying to attach them too.)
- Jim Van Zandt
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.22
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Versions of packages tkdiff depends on:
ii tk8.3 8.3.5-6etch2 Tk toolkit for Tcl and
X11, v8.3 -
ii tk8.4 8.4.12-1etch2 Tk toolkit for Tcl and
X11, v8.4 -
-- no debconf information
before
Description: before
after
Description: after
