From: Joachim E. <joa...@gm...> - 2004-04-03 10:27:52
|
Hi Bernie, On Friday 02 April 2004 13:30, Bernie Ogden wrote: > A very very nice tool. I've got two bugs: > ..... > And a few future development suggestions: > ..... Thanks for the detailed reports. I'll investigate ... > An option to ignore CVS comments (e.g. $Revision: $) > or to treat them as whitespace would be nice As Michael already pointed out, this can be solved via a preprocessor: Specify the following command as line-matching-preprocessor in the KDiff3-options. sed "s/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/" New to sed? Read more at http://www.gnu.org/software/sed/manual/html_mono/sed.html#SEC7 (With all these user wishes I finally learn regular-expressions myself.) If you are under Windows: A precompiled binary sed-version for Windows is available at http://unxutils.sourceforge.net Unpack the zip-file and copy the tool from usr\local\wbin\sed.exe into your path. Otherwise you must specify the full path to the tool. Eg. if unpacked in C: c:\usr\local\wbin\sed [options as shown above] > CVS integration, as in tkdiff. Its really useful to be > able to do a graphical CVS diff See my previous answer here: http://sourceforge.net/mailarchive/forum.php?thread_id=4078590&forum_id=38851 > Any chance of extending it to do binary diffs? If it > could do those then I could be using one tool for all > my diffing, which would be kinda nice. For the moment KDiff3 doesn't reject binary files as other tools do, but during the diff and display KDiff3 substitutes some characters with spaces, which means that it's not fully reliable for binary files. I agree, that it would be nice some future version perhaps. Cheers, Joachim |