Bug 58531 - use external merge tool
use external merge tool
Status: NEW
Product: utilities
Classification: Unclassified
Component: Diff
3.x
All All
: P3 (vote)
: 6.x
Assigned To: Tomas Stupka
diff-issues@utilities
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2005-05-03 14:52 UTC by drscott
Modified: 2010-10-07 15:16 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
:


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. 


By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2012, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo