Summary: | kompare fails to diff "mysqldump --no-data" dump files | ||
---|---|---|---|
Product: | [Applications] kompare | Reporter: | Steve McInerney <steve> |
Component: | general | Assignee: | Kompare developers <kompare-devel> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | markus.schoepflin |
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | Ubuntu | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
Steve McInerney
2009-09-27 13:46:04 UTC
Confirming. The diff output will have lines that start with "---" in the content, it's probably tripping up on them. 3_way_kompare branch doesn't have the same problem, i'll try to see why. SVN commit 1028512 by je4d: Revert the fix for bug 139209 - the fix used caused bug 208688. 139209 needs to be fixed by counting lines instead. BUG:208688 CCBUG:139209 M +1 -3 parserbase.cpp WebSVN link: http://websvn.kde.org/?view=rev&revision=1028512 This is actually a duplicate of bug 204253. It's the "--" at the beginning of lines which confuses Kompare. (This also breaks diffing Haskell source files with their -- comments, by the way.) There's a proposed patch there, which AFAICT implements exactly this "counting lines" feature. We should look at that one, as it should allow fixing both bug 139209 and this one. *** Bug 204253 has been marked as a duplicate of this bug. *** We're using the fix from https://bugs.kde.org/show_bug.cgi?id=204253#c4 (which actually counts diff lines) now. SVN commit 1028719 by kkofler: Revert the fix for bug 139209 - the fix used caused bug 208688. 139209 needs to be fixed by counting lines instead. CCBUG:208688 CCBUG:139209 backport revision 1028512 by je4d from trunk M +1 -3 parserbase.cpp WebSVN link: http://websvn.kde.org/?view=rev&revision=1028719 |