My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 3095: SideBySide2: Wrong diff highlighting if the source file contains CRs without LFs
2 people starred this issue and may be notified of changes. Back to list
Status:  New
Owner:  ----


Sign in to add a comment
 
Project Member Reported by edwin.ke...@gmail.com, Jan 9, 2015
Affected Version: current master (d8dd82a773bf727232d1f0c991ea58462558256f), 2.9

What steps will reproduce the problem?
1. Upload a change that contains a file 'test.txt' with the content of the attached file 'test.txt.old' (the second line contains a CR without LF).
2. Upload a follow-up change where the content of 'test.txt' is changed to the content of the attched file 'test.txt.new' (the second line is changed).
3. Look at the diff of 'test.txt' of the follow-up change in the new Side-by-Side Diff Screen.

What is the expected output? What do you see instead?

The second line is highlighted as changed although the modification is in the third line.

Screenshot:
  http://i.imgur.com/uSlF1Sb.png

Please provide any additional information below.

The displayed diff get's completely spoiled if a file contains many CRs without LFs.

The old Side-by-Side Diff Screen is displaying the diff correctly, this is because the line that contains the CR without LF is treated as 1 line and not as 2 lines).
test.txt.old
83 bytes   Download
test.txt.new
83 bytes   Download
Sign in to add a comment

Powered by Google Project Hosting