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 200206201555 Check out the screenshot, notice the off-by-one error in the left window on the second change.
Created attachment 6822 [details] Off-by-one error in left window
Is it reproducible?? If so, can you please attach the two file versions where this happens? Thanks.
Well, I'm not able to reproduce it. Please attach the sources in which this happen. I've tried making similar differences, but everything works O.K.
Created attachment 6839 [details] Similar differeces, the result is O.K.
Attaching sources...
Created attachment 6844 [details] New version of file
Created attachment 6845 [details] Old version of file
Please try CVS | DIFF using the two attachments (old, new version of file) and you should end up with the same result as me under the same build number.
Unfortunately I was not able to reproduce the bug neither in dev build 200206200100 nor in recent release34 build 200207182340. Your build #200206201555 is probably some old continual build, which I can not find. But #200206200100 should not differ that much. The diff as I get it attached...
Created attachment 6858 [details] The diff between the attached sources.
It's not clear to me why it does not work for you. There is missing one deleted line in your screeshot. This has caused the problem. Can you please attach the diff from the command-line CVS executable "cvs diff ...", so that we can be sure, that the server returns the correct list of differences? Does the same problem appear in recent 3.4 builds? In the mean time resolving as "worksforme".
ha! Just remembered something that might be vital! At work I use "Ignore whitespace" and "Ignore blank spaces"; maybe one of those features is broken leading to the spaces we see! Please try again on your end with these features enabled.
Reopening, I was able to reproduce it with mentioned switches. Good memory, Gili ! ;-) RC1 build #200207222340 of NetBeans 3.4.
This is another good candidate for Release Notes because we can't make it into NetBeans 3.4. At the same time it concerns Generic VCS module too.
O.K. the "Ignore Blank Lines" was the key switch, which caused the text to be shifted. Every switch, that cause some added/removed lines to be excluded from the diff report will shift the text and coloring of differences in one source with respect to the other.
Working on a fix into 4.0 ...
The problem is fixed in the command-line CVS by the fix of issue #26146. No additional fixes are necessary. In JavaCVS it's fixed in the main trunk by the following diffs: http://javacvs.netbeans.org/source/browse/javacvs/src/org/netbeans/modules/cvsclient/commands/diff/DiffCommandDisplayer.java.diff?r1=1.10&r2=1.11 http://javacvs.netbeans.org/source/browse/javacvs/src/org/netbeans/modules/cvsclient/commands/diff/DiffDisplayer.java.diff?r1=1.19&r2=1.20 http://javacvs.netbeans.org/source/browse/javacvs/src/org/netbeans/modules/javacvs/commands/CvsDiff.java.diff?r1=1.11&r2=1.12
Works fine in development build #200208050100 of NetBeans 4.0.
proposed release note: The line numbers do not always match when using the CVS Diff command with the Ignore Blank Lines option turned on.
Exactly !
Adding 3.4.1_CANDIDATE, this can 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/javacvs/src/org/netbeans/modules/cvsclient/commands/diff/DiffCommandDisplayer.java,v <-- DiffCommandDisplayer.java new revision: 1.10.82.1; previous revision: 1.10 /cvs/javacvs/src/org/netbeans/modules/cvsclient/commands/diff/DiffDisplayer.java,v <-- DiffDisplayer.java new revision: 1.19.20.1; previous revision: 1.19 /cvs/javacvs/src/org/netbeans/modules/javacvs/commands/CvsDiff.java,v <-- CvsDiff.java new revision: 1.11.50.1; previous revision: 1.11
Fix of this bug causes 28195 which is P2 so I did rollback of this fix and reopen this bug. We need to find another solution for fixing this bug.
Unfortunately this fix caused a sever regression. I'm scheduling this for 4.0.
*** Issue 32015 has been marked as a duplicate of this issue. ***
As described at http://www.netbeans.org/servlets/ReadMsg?msgId=655179&listName=nbusers the development of javacvs module has been stopped.
Martin, If this issue is not fixed it affects Generic VCS as well so we should not close this issue.
removing RELNOTE keyword; if this bug still occurs in vcsgeneric, point me to a related bug report