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 73089

Summary:	Implement preview before merging.
Product:	utilities	Reporter:	Peter Pis <ppis>
Component:	Diff	Assignee:	Ondrej Vrabec <ovrabec>
Status:	NEW ---
Severity:	blocker
Priority:	P2
Version:	6.x
Hardware:	All
OS:	All
Issue Type:	ENHANCEMENT	Exception Reporter:

Description Peter Pis 2006-02-28 10:48:34 UTC

Product Version         = NetBeans IDE Dev (Build 060227)
Operating System        = Windows XP version 5.1 running on x86
Java; VM; Vendor; Home  = 1.5.0_06; Java HotSpot(TM) Client VM 1.5.0_06-b05; Sun
Microsystems Inc.; d:\Java\jdk1.5.0_06

Currently there is no way of showing changes before merging. "Revert Changes"
action is not suitable for all cases, cos it removes local changes. In "Merge"
dialog add functionality for displaying differences before merge action is applied.

Comment 1 Josef Pavlicek 2007-03-12 17:26:39 UTC

Rescheduled.

Comment 2 Josef Pavlicek 2007-03-12 17:27:32 UTC

Rescheduled.

Comment 3 Tomas Stupka 2008-01-02 16:32:00 UTC

*** Issue 124312 has been marked as a duplicate of this issue. ***

Comment 4 Tomas Stupka 2008-01-02 16:32:38 UTC

see also issue #124312

Comment 5 Peter Pis 2008-10-23 14:53:27 UTC

General issue for all VCS supported by the IDE.