KDE File Difference/Merge tool

[Roberto Alsina]

On Tue, 26 Oct 1999, Richard Dale wrote:

> I've been comparing the sources in the 'kwrite' subdirectory of KDevelop, with
> the sources in the kwrite directory under kdeutils-1.1.2/kwrite. They have both
> obviously started off from the same code base. There were some bug fixes and
> enhancements which were in the KWrite code, but not in KDevelop and vica versa.
> Situation normal - welcome to real world software development!.
> 
> So I took diff's of the source and worked through manually reconciling the best
> bits from each of the pairs of source files. I can now double click on a word
> in kwrite to select it (like you can in KDevlelop), and I've added some code to
> implement the 'Delete On Input' option in KDevelop which was missing.
> 
> It would have been really handy to have a visual diff tool to do this (I like
> 'FileMerge.app' on Mac OS X Server for instance). I think it should be a
> separate app, but maybe you could have a menu option in KDevelop called 'Import
> and Merge' or similar (and also integrated with the KDevelop CVS interface).
> 
> Does anyone know if such an app already exists (or are there any plans to write
> one)?

Have you looked at kdiff?

 ("\''/").__..-''"`-. .         Roberto Alsina
 `9_ 9  )   `-. (    ).`-._.`)  ralsina at unl.edu.ar
 (_Y_.)' ._   ) `._`.  " -.-'   Centro de Telematica
  _..`-'_..-_/ /-'_.'           Universidad Nacional del Litoral
(l)-'' ((i).' ((!.'             Santa Fe - Argentina
                                KDE Developer (MFCH)
Not mad, but bound more than a madman is (Romeo and Juliet, Act I Scene II)