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 24425 - Support more externall Diff&Merge engines and support Merging of 2 different files
Summary: Support more externall Diff&Merge engines and support Merging of 2 different ...
Status: NEW
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 3.x
Hardware: PC Linux
: P3 blocker (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-06-05 12:11 UTC by dmladek
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 dmladek 2002-06-05 12:11:21 UTC 
Product Version       = NetBeans IDE Development
Version (Build 200206050100)
  IDE Versioning        = IDE/1 spec=2.21
impl=200206050100
  Operating System      = Linux version 2.4.18
running on i386
  Java; VM; Vendor      = 1.4.1-beta; Java
HotSpot(TM) Client VM 1.4.1-beta-b13; Sun
Microsystems Inc.
  Java Home             =
/usr/java/j2sdk1.4/sun/jdk1.4.1/jre
  System Locale; Encod. = cs_CZ; ISO-8859-2
======================================================================


There is quite new module borne from vcsgeneric:
diff module.

It knows now: use 2 diff engines (externall/internall)
 would be nice if I could specify more externall
engines...
 it could show differences between 2 different
files (not versioned)

Merge Tool (or Conflict resolver) knows till now
only work over versioned files (if they have
status [conflict].

I think with the help of externall diff3 engines
it could be so hard to teach this tool merge 2
different files which are not version controled.
Comment 1 Marek Grummich 2002-07-22 09:46:07 UTC 
Set target milestone to TBD
Comment 2 Martin Entlicher 2005-05-16 13:47:07 UTC 
This can be considered for 4.2 also, but I'm not sure if it's doable in the
given timeframe.