This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
dev build 200401301900 I've attached two versions of the same file. I have noticed that the text diff displays the correct results but the graphical diff lines get out of sync for "2699a2720,2731". Specifically: - Given a "new panel" and "old panel" associated with the newer and older versions of the file respectively. - new lines (denoted by the color green) are shown in the newer panel, but - the old panel does not leave these lines blank. Instead, it continues listing some code so that when the "new lines section" is over the older panel is out of sync by "length(new lines section)" lines I know my explanation is quite cryptic but if you take a look at the output yourself you should be able to understand what I mean. Please feel free to direct further questions to me if you need any help reproducing this.
Created attachment 13179 [details] Newer version of file
Created attachment 13180 [details] Older version of file
Gili, I'm not able to reproduce this problem :-( I've saved the attached files, selected them in NB and run Tools -> Diff. The GUI diff looks good, there are no lines out of sync, all lines match. Then I've committed the files to a test local CVS repository as two revisions of a single file. And CVS -> Graphical Diff also returned correct results. I've tried switches like -b, -B, but the GUI diff was always displayed correctly. Gili, can you please attach the textual diff? IMHO the problem is caused by the two empty lines, which are probably not reported by the diff provider. Also, how do you display the differences? Do you use Tools -> Diff on two files, or do you have the files in CVS and use CVS -> Graphical Diff? Do you set any extra options to the diff?
Unfortunately I can no longer reproduce the original problem, but it might be worth noting I found a related one. If you hit ALT-N/ALT-P to move to the next/previous difference, weird things begin to happen. Attached are newer2.txt, older2.txt and screenshot2.jpg illustrating the problem. What I noticed is that if you hit ALT-P and move to the last diff found in the file, the left/right pane line numbers are out of sync. If, however, you dumped these files to disk and ran TOOLS -> DIFF on them the problem did not occur. So aparently there is a bug in the online CVS | DIFF tool. I can reproduce the problem on my end by diffing versions 1.211 and 1.215 of a certain file. Perhaps the bug is triggered by diffs across multiple version numbers.
Created attachment 13226 [details] Older file, test2
Created attachment 13227 [details] Newer file, test2
Created attachment 13228 [details] Screenshot of test2
I was able to reproduce the problem that is shown in the screenshot when I was switching between the first and the last difference. When I touch the vertical scroll bar, the lines are corrected. This seems to occur only when the last difference is on the last line. File "newer2.txt" does not end with a newline. Maybe that this is causing the problems. I'm lowering the priority to P3, this does not seem to be a serious problem.
Moving to diff module, this is a problem of the GUI diff visualizer.
Scheduling for promotion D.
Can not reproduce anymore.
Besides new Hunt algorithm is very neat it correctly detects /* end */ as pure addition.