Code Comparison Utility
https://apps.kde.org/kdiff3
KDiff3 is a program that:
* Compares or merges two or three text input files or directories
* Shows the differences line-by-line and character-by-character
* Provides an automatic merge facility and an integrated editor for
solving merge conflicts
* Supports KDE's KIO framework (allows accessing ftp, sftp, fish, smb, etc.)
- Devel package for openSUSE:Factory
-
6
derived packages
- Links to openSUSE:Factory / kdiff3
- Download package
-
Checkout Package
osc -A https://api.opensuse.org checkout KDE:Extra/kdiff3 && cd $_
- Create Badge
Refresh
Refresh
Source Files
Filename | Size | Changed |
---|---|---|
0001-Collected-fixes-from-master.patch | 0000051289 50.1 KB | |
_link | 0000000141 141 Bytes | |
kdiff3-1.9.2.tar.xz | 0001053404 1 MB | |
kdiff3-1.9.2.tar.xz.sig | 0000000833 833 Bytes | |
kdiff3.changes | 0000014103 13.8 KB | |
kdiff3.keyring | 0000012045 11.8 KB | |
kdiff3.spec | 0000003208 3.13 KB |
Revision 31 (latest revision is 53)
Christophe Giboudeaux (cgiboudeaux)
accepted
request 902836
from
Tilman Vogel (tivo)
(revision 31)
The latest kdiff3 currently shipped with Tumbleweed is unsuitable for everyday use. I, for example, use it as my go-to `git mergetool` and I need that a lot. And it must be reliable and not messing up merge-output. Since the upgrade from 1.8.4 to 1.9.2, many regressions have to be experienced, please see the list of fixed issues below. From a distribution point of view, I see two options: Fix-up 1.9.2 like proposed here, or (really!) downgrade to 1.8.5 until a new reliable 1.9 release comes out. I have contributed many fixes to upstream meanwhile. - Remove GCC 11 build fix: * 0001-Explicitly-include-limits-for-compatibility-with-gcc.patch now contained in squashed patch - Add collected fixes from upstream master: * 0001-Collected-fixes-from-master.patch contains the original and many more fixes: + misalignment and wrong conflict resolutions when using manual alignment markers + uninitialized variables causing crashes + hangs and crashes due to wrong loop conditions + wrong handling of new-line at end-of-file + spurious insertion of empty lines in merge result + access of uninitialized iterators causing crashes + wrong buffer length calculations causing out-of-bounds access + wrong bit-logic causing comments to always be treated as white-space + crashes when hitting a key on empty merge results + technical details allowing fixes to be cherry-picked
Comments 0