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.
I tried to run graphical diff (directly from context menu) an then I switched to to text diff using combo on top of the form. The textual diff contained just information about lines where the change was made. Text diff from context menu is OK, so the problem occurs only when switching from graphical diff to text diff. found in NetBeans 3.4 RC1
The problem is in the parser of cvs diff output. It does not provide the text of the differences. The graphical diff does not need the text, but the textual diff does.
The fix is simpler that I thought. The parser already provides the text of the differences, but the command does not supply it. I had to change the regular expressions so that the data output of cvs diff command will contain also the text of the differences. You can fix it yourself ;-) Fixed in the main trunk. Diffs: http://vcsgeneric.netbeans.org/source/browse/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsUnix.xml.diff?r1=1.14&r2=1.15 http://vcsgeneric.netbeans.org/source/browse/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsWin.xml.diff?r1=1.14&r2=1.15 http://vcsgeneric.netbeans.org/source/browse/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsWin98.xml.diff?r1=1.14&r2=1.15
I am sorry to disappoint you, but it's worse now than before the fix. Textual diff does not show anything, not even those line numbers. Can you please investigate it ?
I'm sure, that it was not caused by this fix. Thus I'm closing this as FIXED, because it adds the text content of the differences. Instead I'm reopening issue #23096, that was submitted for problem like this.
In such case I have no objections.
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/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsUnix.xml,v <-- cvsUnix.xml new revision: 1.12.18.2.4.2; previous revision: 1.12.18.2.4.1 /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsWin.xml,v <-- cvsWin.xml new revision: 1.12.18.2.4.2; previous revision: 1.12.18.2.4.1 /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsWin98.xml,v <-- cvsWin98.xml new revision: 1.12.18.2.4.2; previous revision: 1.12.18.2.4.1
Resolved for 3.4.x or earlier, no new info since then -> closing.