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.
Since yesterday (at least Mercurial) diff to base view is completely broken: - graphical view doesn't have local file state - textual is not scrollable by mouse wheel I will attach images
Created attachment 159343 [details] broken graphical
Created attachment 159344 [details] text diff is not empty, but not scrollable
Product Version: NetBeans IDE Dev (Build 20160419-52078a0c7356) Java: 1.8.0_72; Java HotSpot(TM) 64-Bit Server VM 25.72-b15 Runtime: Java(TM) SE Runtime Environment 1.8.0_72-b15 System: Linux version 3.16.0-38-generic running on amd64; UTF-8; en_US (nb)
Ondra, if you need I can send you reduced hg repo by mail
textual diff not scrollable is an old issue: bug 257503, resp. its duplicate bug 258500. About the view being empty, I don't know. Does it fix if you click into the right view? Or start typing into it?
(In reply to Ondrej Vrabec from comment #5) > textual diff not scrollable is an old issue: bug 257503, resp. its duplicate > bug 258500. Ok. But mouse whee doesn't work in graphical view now as well... > About the view being empty, I don't know. Does it fix if you click into the > right view? No changes > Or start typing into it? It is gray read-only empty panel
I've sent you test repo by mail
All ways of using diff are now broken for the right panel. 1. Selecting two files from Favorites and right-clicking -> Tools -> Diff 2. Right-click file tab in editor -> Diff Too... -> select some other file in the selector 3. Select History view in editor -> select versions or select single version and Compare mode (Diff to Previous, or Diff to Current) 4. Right-click file tab in editor -> Git -> Show Changes or Diff There may be other ways to get file comparisons in the IDE, but these at least are all broke for the right hand diff pane in that nothing shows in the right hand pane. Differences still show up in the left hand pane, and you can scroll to them, but you can't see the corresponding right hand.
I haven't changed anything in diff module for the past several months. It may be related to changes in editor, possibly the pin watchers?
Playing with hg bisect reveals... The last good revision: changeset: 295968:9a9b2f700549 parent: 295957:8e63121bc4e3 parent: 295967:550637b08886 user: ffjre@netbeans.org date: Mon Mar 07 00:32:35 2016 +0000 summary: Automated merge with main-silver The revision where the diff starts repainting wrong is its child: changeset: 296825:e7f3e410cbb8 branch: debugger_pin_watch parent: 295968:9a9b2f700549 user: Ralph Benjamin Ruijs <ralphbenjamin@netbeans.org> date: Mon Mar 21 16:35:53 2016 +0100 summary: Prototype Pin Debug Watch In e7f3e410cbb8 the diff right panel is empty and greyed-out.
i hope this fixes this problem... Fix: http://hg.netbeans.org/core-main/rev/97d154c08b2e
*** Bug 258942 has been marked as a duplicate of this bug. ***
*** Bug 258954 has been marked as a duplicate of this bug. ***
Integrated into 'main-silver', will be available in build *201604251813* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-silver/rev/97d154c08b2e User: Ondrej Vrabec <ovrabec@netbeans.org> Log: #258921 - [regression] Diff view is completely broken NB editor changed its component hierarchy and is now wrapped in an internal LayeredPane. Improving diff's code initializing its pane scrollbars so it finds the editor's scrollbars more reliably.
*** Bug 259018 has been marked as a duplicate of this bug. ***
(In reply to Quality Engineering from comment #14) > Integrated into 'main-silver', will be available in build *201604251813* on > http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) > > Changeset: http://hg.netbeans.org/main-silver/rev/97d154c08b2e > User: Ondrej Vrabec <ovrabec@netbeans.org> > Log: #258921 - [regression] Diff view is completely broken > NB editor changed its component hierarchy and is now wrapped > in an internal LayeredPane. Improving diff's code initializing its pane > scrollbars so it finds the editor's scrollbars more reliably. http://bits.netbeans.org/dev/nightly/ is already 5 days not working, ie. there are no latest builds since 21st April 2016...