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 187050

Summary:	Scrolling in Diff window should try to keep lines matched
Product:	utilities	Reporter:	swpalmer <swpalmer>
Component:	Diff	Assignee:	Tomas Stupka <tstupka>
Status:	VERIFIED FIXED
Severity:	normal	CC:	mmirilovic, rbalada
Priority:	P2	Keywords:	REGRESSION
Version:	6.x
Hardware:	All
OS:	All
Issue Type:	DEFECT	Exception Reporter:

Description swpalmer 2010-06-01 18:14:33 UTC

Product Version = NetBeans IDE 6.9 RC1 (Build 201005242201)
Operating System = Windows XP version 5.1 running on x86
Java; VM; Vendor = 1.6.0_20
Runtime = Java HotSpot(TM) Client VM 16.3-b01

I removed a bunch of lines from a Java file.  When I scroll the diff view the lines after my edit are scrolled the wrong way, or the wrong side is scrolled, such that they are kept farther apart than then need to be.  The scrolling should try to keep things lined up as much as possible.

Comment 1 Ondrej Vrabec 2010-06-02 08:58:32 UTC

hmm, a regression caused by http://hg.netbeans.org/cdev/rev/60a160f1bf13

Comment 2 Ondrej Vrabec 2010-06-02 09:04:45 UTC

fix: http://hg.netbeans.org/cdev/rev/5f46339f7900

Comment 3 Quality Engineering 2010-06-03 06:08:48 UTC

Integrated into 'main-golden', will be available in build *201006030001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main/rev/5f46339f7900
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Issue #187050 - Scrolling in Diff window should try to keep lines matched

Comment 4 rbalada 2010-06-16 08:54:41 UTC

Please verify bugfix for this bug, so it can be included in release691 repository.

Thanks,
-R

Comment 5 Petr Blaha 2010-06-17 11:51:45 UTC

verified

Comment 6 rbalada 2010-06-18 08:14:06 UTC

main #5f46339f7900 transplanted to release691 #b2a0c70a3202