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 58531 - use external merge tool
Summary: use external merge tool
Status: NEW
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 3.x
Hardware: All All
: P3 blocker (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-05-03 14:52 UTC by drscott
Modified: 2015-11-05 22:54 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description drscott 2005-05-03 14:52:26 UTC
It should be possible to configure Netbeans to use an external diff/merge tool.
Comment 1 Martin Entlicher 2005-05-03 15:43:35 UTC
It is already possible to use an external diff:
Tools -> Options -> IDE Configuration -> Server and Extrenal Tools Settings ->
Diff and Merge Types -> Diff Engines -> Command-line Diff.
You can specify the diff command, where {0} and {1} is replaced with the files
to compare.

The merge can be considered for the future...
Comment 2 drscott 2005-05-05 13:39:12 UTC
The 'engine-toolbox' which lets you choose the command-line-diff is only 
available if you diff by using Tools->Diff.  
It is unfortunately not available if you choose CVS->Diff_Graphical. (But 
that's another issue).  
  
Back to this issue: That possibilty only works well for 'real' diff 
commandline tools.  
That means that the tool has to return output (in proper format) which is then 
used by the graphical component of netbeans.  
  
But I was looking for a possibility to use a completley external diff/merge  
application which its own graphical component (such es KDiff3, e.g).  
  
Such programs are not going to function very well in that way: Netbeans is  
always waiting (not responding) until the external app is closed and after  
that netbeans complains about bad data (no data) recieved from that  
application. That's what this enhance request was ment for. 
Comment 3 Zel123 2015-11-05 22:54:29 UTC
Good analysis - Incidentally , if you is searching for a service to merge two PDF files , my husband encountered a service here  http://www.AltoMerge.com/ and also here http://pdf.ac/7xW6tQ