[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 Soukyuu changed: What|Removed |Added Resolution|WAITINGFORINFO |FIXED Status|NEEDSINFO |RESOLVED --- Comment #9 from Soukyuu --- Updated to 1.9.2 after being randomly hit by this again and it now works, many thanks for fixing! -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 michael changed: What|Removed |Added Status|ASSIGNED|NEEDSINFO Resolution|--- |WAITINGFORINFO --- Comment #8 from michael --- Setting back to NEEDSINFO. I need a test cofirming this happens with current 1.9/master. 1.8.x is no longer supported. -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 --- Comment #7 from michael --- 1.9 now contains a number of regression fixes. This may resolve your issue however this bug was not specifically targeted. -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 michael changed: What|Removed |Added Status|REOPENED|ASSIGNED --- Comment #6 from michael --- 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. -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 mafjm...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED CC||mafjm...@gmail.com Resolution|WORKSFORME |--- Ever confirmed|0 |1 --- Comment #5 from mafjm...@gmail.com --- 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 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 Bug Janitor Service changed: What|Removed |Added Resolution|WAITINGFORINFO |WORKSFORME Status|NEEDSINFO |RESOLVED --- Comment #4 from Bug Janitor Service --- 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! -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 --- Comment #3 from Bug Janitor Service --- 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! -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 michael changed: What|Removed |Added Status|REPORTED|NEEDSINFO Resolution|--- |WAITINGFORINFO --- Comment #2 from michael --- 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. -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 426301] kdiff3: Data loss error when used with "git mergetool"
https://bugs.kde.org/show_bug.cgi?id=426301 --- Comment #1 from Soukyuu --- Created attachment 131488 --> https://bugs.kde.org/attachment.cgi?id=131488&action=edit Screenshot of the error -- You are receiving this mail because: You are watching all bug changes.
