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.
When the diff algorithm does not report empty lines as differences, the graphical diff is corrupted. The graphical diff should use a heuristic to detect, that a missing or added empty line was not reported as a difference. This is necessary to be able to fix issue #25844.
Fixed in the main trunk. We compare the corresponding lines in both documents to assure, that the lines will match even when t here are unreported missing or added lines. Diffs: http://diff.netbeans.org/source/browse/diff/src/org/netbeans/modules/diff/builtin/visualizer/DiffPanel.java.diff?r1=1.11&r2=1.12 http://diff.netbeans.org/source/browse/diff/src/org/netbeans/modules/diff/builtin/visualizer/DiffComponent.java.diff?r1=1.8&r2=1.9
Works fine in development build #200208050100 of NetBeans 4.0.
Adding 3.4.1_CANDIDATE, this should go into 3.4.1 IMHO.
Hi. This issue is marked as 3.4.1_CANDIDATE. It means that it should be integrated into release341 one branch. The plan at http://www.netbeans.org/devhome/docs/releases/34/index.html expected beta1 to be produced on Dec01. That did not happen due to a lot of outstanding not integrated candidates like this one. Would it be possible to spend few minutes by backporting this fix? Thank you in advance.
Merged into release341 branch. /cvs/diff/src/org/netbeans/modules/diff/builtin/visualizer/DiffComponent.java,v <-- DiffComponent.java new revision: 1.8.20.1; previous revision: 1.8 /cvs/diff/src/org/netbeans/modules/diff/builtin/visualizer/DiffPanel.java,v <-- DiffPanel.java new revision: 1.10.10.1.4.1; previous revision: 1.10.10.1
Resolved for 3.3.x or earlier, no new info since then -> closing.