I'm looking for a graphical (GUI/X) diff command which allows proper X cut and paste. I've found xdiff (well, one of them, there are a couple) and mgdiff but neither allows one to select lines from the display and to paste them elsewhere. They both expect you're trying to merge the diff'ed files into an output file so the select actions only decide whether what you have selected goes into the output file or not.
What I need to do is to be able to see differences between two files and paste them into a third file which is (probably) open in a different window. I can't find a diff utility which allows me to do this. Does anyone have any recommendations?
It needs to be fairly 'generic unix' as I want it to run on a Solaris box. I'm quite happy to compile stuff but I'm not happy if the program needs lots of specialist libraries.
Chris Green chris@areti.co.uk writes:
What I need to do is to be able to see differences between two files and paste them into a third file which is (probably) open in a different window. I can't find a diff utility which allows me to do this. Does anyone have any recommendations?
Have you tried tkdiff?
On Tue, Jan 20, 2004 at 11:09:53PM +0000, Richard Kettlewell wrote:
Chris Green chris@areti.co.uk writes:
What I need to do is to be able to see differences between two files and paste them into a third file which is (probably) open in a different window. I can't find a diff utility which allows me to do this. Does anyone have any recommendations?
Have you tried tkdiff?
Well, yes, sort of. I tried it on my desktop Sparc and it worked OK (if a little slowly) but unfortunately on the target system where I need the diff Tcl/Tk isn't installed at the moment.
Given that I can't find any good alternatives I may look into getting Tcl/Tk installed as tkdiff does do exactly what I need.
On 2004-01-20 13:27:26 +0000 Chris Green chris@areti.co.uk wrote:
I'm looking for a graphical (GUI/X) diff command which allows proper X cut and paste. [...]
Have you tried the various emacs diff commands?
On Tuesday 21 Sep 2004 01:27, MJ Ray wrote:
On 2004-01-20 13:27:26 +0000 Chris Green chris@areti.co.uk wrote:
I'm looking for a graphical (GUI/X) diff command which allows proper X cut and paste. [...]
Have you tried the various emacs diff commands?
Kompare is a really good tool, is part of KDE and works without the hassle of trying to learn Emacs
Matt
On Tue, 21 Sep 2004 01:35:24 +0100, Matt Parker matt@mpcontracting.co.uk was rumoured to have said:
On Tuesday 21 Sep 2004 01:27, MJ Ray wrote:
On 2004-01-20 13:27:26 +0000 Chris Green chris@areti.co.uk wrote:
I'm looking for a graphical (GUI/X) diff command which allows proper X cut and paste. [...]
Have you tried the various emacs diff commands?
Kompare is a really good tool, is part of KDE and works without the hassle of trying to learn Emacs
Some time ago I looked at most of the graphical diff viewers included in Debian, here are the ones that stood out:
* diff-mode in Emacs. Works beautifully with the VC svn backend, but the default colours could be better. Hassle? What hassle? :P
* tkdiff (http://freshmeat.net/projects/tkdiff/). Can highlight changed regions within a line (see screenshot) and not take forever to do it. Cannot load an existing patch, files to be diffed must be passed on the command line or in a gui dialog.
* colordiff (http://colordiff.sourceforge.net/). Handy diff colouriser for your favourite terminal app, use like so: diff -u old new | colordiff | less -R
Mgdiff and meld are ok too, the latter being very slow with large files.
I'll have a look at kompare sometime, although I don't use KDE and would rather not load all these libraries and kdeinit processes...
Matt
rgrds, /-sb.
-
Chris Green -
Matt Parker -
MJ Ray -
Richard Kettlewell -
Stelios Bounanos