Recent changes to bugs

#222 Automerge loss of information

2020-05-24T03:26:29.706000Z

Now being matained at invent.kde.org. bugs can be reported to bugs.kde.org. See https://download.kde.org/stable/kdiff3/ for new releases.

#221 Severe Internal Error: Data loss error

2020-05-24T03:19:09.694000Z

status: open --> closed
discussion: enabled --> disabled

#225 Input from /dev/null rejected

2020-05-04T22:40:41.830000Z

This is not the bug report location please report at bugs.kde.org

Input from /dev/null rejected

2020-02-25T14:29:50.845000Z

I am using Kdiff3 as a merge tool with git. A while ago (don't remember exactly when), kdiff3 used to accept /dev/null as an input file, but that is no longer the case - I get an error saying '/dev/null is not a normal file'. This greatly limits the usefulness of kdiff3 in this context, as git passes /dev/null as one of the inputs for newly created or deleted files. If this happens I have to click away three dialog windows before I can continue. This is really annoying.

#174 mergeResultSaved: m_pMFI=0 (This should never happen)

2019-11-27T09:27:33.484000Z

I've built this fork and the problem's not there!

HTH

Ubuntu 19.10: file diff not possible - file selection does not work

2019-11-19T19:11:16.453000Z

Hi,
please take a look at kdiff 1.8.1 version with Ubuntu 19.10
the A, B, C "File" option does not sho any files in the folder
and it is not possible to select files,
thus is it is not possible to perform diff of files.

Critical defect
Mauro

1.9.7 always crashing attempting to merge on Windows

2019-11-07T15:06:38.411000Z

Hand built & installed latest version () via craft following instructions in INSTALL for windows. Whenever I try to run a merge:

Data loss error:
If it is reproducible please contact the author.

Then kdiff3 just hangs when I dismiss the error dialog. This reproduces with very simple inputs. For example, a.txt (base), b.txt, c.txt which have "abc", "abc\ndef", and "xyz\nabc\ndef" respectively.

#222 Automerge loss of information

2019-10-07T23:00:56.830000Z

Git will show conflict message. When user execute 'git mergetool' command, with Kdiff3, it will run automerge and will remove some data.

Automerge loss of information

2019-10-04T13:30:30.833000Z

KDiff3 v0.9.98 for windows

commit and push the Dev1 modifications
commit Dev2 modifications and pull

ORIGIN Dev1 Dev2 Dev2 Merge Pull Result
A | A | A | A
B | B | B | B
II | II | 2 | C
2 | C | C | D
C | D | D | E
D | IV | 4 | F
IV | E | E |
4 | F | F |
E | VI | 6 |
F |
VI |
6 |

#221 Severe Internal Error: Data loss error

2019-03-29T19:22:24.257000Z

It's fixed in latest git master, so it can be closed.