SUMMARY using kdiff3 as git mergetool leads to an error message being displayed, loading the same files manually works. STEPS TO REPRODUCE 1. create a (text) file conflict situation in git 2. attempt to run "git mergetool" with kdiff3 configured OBSERVED RESULT "Severe Internal Error"/"Data loss error: If it is reproducible please contact the author." EXPECTED RESULT kdiff3 opening and merging the files SOFTWARE/OS VERSIONS Linux/KDE Plasma: arch linux current / plasma 5.19-5 KDE Plasma Version: 5.19 KDE Frameworks Version: 5.73.0 Qt Version: 5.15 git Version: 2.28.0 ADDITIONAL INFORMATION It used to work a few versions before (very helpful, I know...), but I can't say when exactly it stopped working. I first noticed it with 1.8.3 and it is still occurring with 1.8.4
Created attachment 131488 [details] Screenshot of the error
What data are you having this issue with? The error does not show up for all files when using kdiff3 as described. I have used it on multiple merge conflict situations when back-porting patches from master to 1.8 in kdiff3. This error is difficult to trouble shoot without a repo case.
Dear Bug Submitter, This bug has been in NEEDSINFO status with no change for at least 15 days. Please provide the requested information as soon as possible and set the bug status as REPORTED. Due to regular bug tracker maintenance, if the bug is still in NEEDSINFO status with no change in 30 days the bug will be closed as RESOLVED > WORKSFORME due to lack of needed information. For more information about our bug triaging procedures please read the wiki located here: https://community.kde.org/Guidelines_and_HOWTOs/Bug_triaging If you have already provided the requested information, please mark the bug as REPORTED so that the KDE team knows that the bug is ready to be confirmed. Thank you for helping us make KDE software even better for everyone!
This bug has been in NEEDSINFO status with no change for at least 30 days. The bug is now closed as RESOLVED > WORKSFORME due to lack of needed information. For more information about our bug triaging procedures please read the wiki located here: https://community.kde.org/Guidelines_and_HOWTOs/Bug_triaging Thank you for helping us make KDE software even better for everyone!
SUMMARY Git mergetool: kdiff3 fails with Data loss error on conflicts on revert hunks STEPS TO REPRODUCE In the following scenario git mergetool with kdiff3 always ends up with 'Data loss error'. This has been for years - so not a recent regression. git mergetool -t meld works but of course is not as useful, also vscode can show the conflicting hunk. o change A | |\ o | revert change A | o hunk building on change A |/ . merge attempt shows conflict between two branches OBSERVED RESULT git mergetool with kdiff3 as the tool fails. It is always 'Data loss error'. Cannot share repo as non-public. EXPECTED RESULT Kdiff3 starts SOFTWARE/OS VERSIONS Name : kdiff3 Version : 1.8.4 Release : 1.fc31 Architecture : x86_64 Size : 5.9 M Source : kdiff3-1.8.4-1.fc31.src.rpm ADDITIONAL INFORMATION
Thanks for the information I also found a possibly related comment from the original maintainer in a WIP branch. This is now on my system but has not been pushed to the new repo in anyform just yet. I'll have look at this and the repro case you outlined to see whats going on here.
1.9 now contains a number of regression fixes. This may resolve your issue however this bug was not specifically targeted.
Setting back to NEEDSINFO. I need a test cofirming this happens with current 1.9/master. 1.8.x is no longer supported.
Updated to 1.9.2 after being randomly hit by this again and it now works, many thanks for fixing!