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 - Implement preview before merging.
Summary: Implement preview before merging.
Status: NEW
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 6.x
Hardware: All All
: P2 blocker with 2 votes (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
: 124312 (view as bug list)
Depends on:
Blocks:
 
Reported: 2006-02-28 10:48 UTC by Peter Pis
Modified: 2014-06-05 12:15 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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.