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.

Bug 247373 - CVS diff with single block difference not positioned correctly initially
Summary: CVS diff with single block difference not positioned correctly initially
Status: RESOLVED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 8.0.1
Hardware: PC Linux
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-09-22 16:06 UTC by mclaborn
Modified: 2014-10-05 02:05 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments
Screen shot as it is now (broken) (78.90 KB, image/png)
2014-09-22 16:07 UTC, mclaborn
Details
Screen shot as it should be (36.05 KB, image/png)
2014-09-22 16:08 UTC, mclaborn
Details

Note You need to log in before you can comment on or make changes to this bug.
Description mclaborn 2014-09-22 16:06:47 UTC
Product Version = NetBeans IDE 8.0.1 (Build 201408251540)
Operating System = Linux version 3.13.0-35-generic running on amd64
Java; VM; Vendor = 1.7.0_67
Runtime = Java HotSpot(TM) 64-Bit Server VM 24.65-b04

Running a CVS "diff" on a long file (5600+ lines) with a single block of changes does not position the display correctly on the left side (CVS base version).  The left side is positioned at the top of the file while the right side (locally modified) is positioned at the changed block.  The left side should be positioned at the changed section.  Screen shots coming shortly.
Comment 1 mclaborn 2014-09-22 16:07:31 UTC
Created attachment 149430 [details]
Screen shot as it is now (broken)
Comment 2 mclaborn 2014-09-22 16:08:09 UTC
Created attachment 149431 [details]
Screen shot as it should be
Comment 3 Ondrej Vrabec 2014-09-25 07:42:35 UTC
Any exception related to diff in the IDE log?
Is it reproducible? Does it happen every time?
Comment 4 mclaborn 2014-09-25 13:32:45 UTC
It does happen every time with this particular Java class and other large files. It works properly in small files (e.g. 55 lines).

The only thing I see in the IDE log is this:


WARNING [org.netbeans.modules.options.keymap.LayersBridge]: Invalid shortcut: org.openide.loaders.BrokenDataShadow@3e912e23[MultiFileObject@95da4f5[Shortcuts/D-R.shadow]]
WARNING [org.netbeans.modules.options.keymap.LayersBridge]: Invalid shortcut: org.openide.loaders.BrokenDataShadow@3e912e23[MultiFileObject@95da4f5[Shortcuts/D-R.shadow]]
Comment 5 Ondrej Vrabec 2014-09-30 09:17:51 UTC
i can reproduce in a large file with a modification on line 5100.
Comment 6 Ondrej Vrabec 2014-10-03 07:47:53 UTC
fixed: core-main #9ce6969fcbb7
Comment 7 Quality Engineering 2014-10-05 02:05:02 UTC
Integrated into 'main-silver', will be available in build *201410050001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/9ce6969fcbb7
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Issue #247373 - CVS diff with single block difference not positioned correctly initially