| Ticket Hash: | 7084745f4b543d3413bf94dda85547b546fd27ea | ||
| Title: | unexpected contents of display | ||
| Status: | Closed | Type: | Code_Defect |
| Severity: | Minor | Priority: | Immediate |
| Subsystem: | Diff_Display | Resolution: | Fixed |
| Last Modified: |
2012-02-17 01:34:14 13.24 years ago |
Created: |
2012-01-10 15:02:53 13.35 years ago |
| Version Found In: | 2.6.1 | ||
| Description: | ||||
|
I am comparing two files which are quite similar, but have small differences. I have options set to ignore space changes (-b), no preprocessing, parse small blocks, characters, mark last (I am not certain that that is...).
Context is set to show only diffs. What i get is a list of 14 lines. The first line number is yellow background, with red letters, and shows me exactly what characters differ with a pink background and red letters... EXACTLY what I needed. The next 4 line numbers are pink background and red letters. I don't understand what makes their line numbers pink background instead of yellow. Is yellow used for the first line of difference? Anyways, the show me differences within in the line using pink background and red letters for changing letters, light green background and dark green letters for info that exists in one and not the other window. Then I get a line number with white background and black digits. I don't see anything different in the line in either window, so I don't know why it is there. I see 6 more line numbers with pink background and red digits. They contain the pink bacground and red letters for changing info just as expected. Finally, I see the last line is a white background, black didgits, and no coloring within the lines. If there wasn't one of these in the middle of the output, I would have just assumed that was the way the "end of difference" was being indicated. However, since I have two of these lines being displayed, I'm uncertain what the intent is for them. Thank you for a wonderful tool. It is greatly appreciatedl. peter added on 2012-01-26 23:00:43 UTC: Answer: The currently selected change is highlighted with yellow on the line numbers. If you turn on the toolbar you can navigate between changes. From above: Then I get a line number with white background and black digits. I don't see anything different in the line in either window, so I don't know why it is there. Answer: If it is black it is unchanged. The reason it shows up is probaly because it is directly between two changes, e.g. if line 5 and 7 had changes, line 6 will show up in black. This is a bug in the code that controls what is skipped in "context" or "diff only" (which is just zero context). From above: Finally, I see the last line is a white background, black didgits, and no coloring within the lines. Answer: I'm guessing this is related to the same bug as above. An extra line slips through after the last change. peter added on 2012-02-17 01:34:14 UTC: | ||||