https://bugs.kde.org/show_bug.cgi?id=442618
Bug ID: 442618
Summary: KDiff3 crashes on a git merge conflict with "Severe
Internal Error line != i for srcSelector= 1"
Product: kdiff3
Version: 1.9.3
Platform: Archlinux Packages
OS: Linux
Status: REPORTED
Severity: crash
Priority: NOR
Component: application
Assignee: [email protected]
Reporter: [email protected]
Target Milestone: ---
SUMMARY
I've observed Kdiff3 sporadically failing to open certain merge conflicts.
On the command-line it prints "Severe Internal Error." line != i for
srcSelector= 1.
STEPS TO REPRODUCE
Running git mergetool on a file that conflicts. Not really sure what is it
about the merge conflict & haven't figured out how to reduce this to a more
standalone case.
OBSERVED RESULT
org.kde.kdiff3: "Loading A: somefile_BASE_1458148.c++"
org.kde.kdiff3: "Loading B: somefile_LOCAL_1458148.c++"
org.kde.kdiff3: "Loading C: somefile_REMOTE_1458148.c++"
org.kde.kdiff3: "Diff: A <-> B"
org.kde.kdiff3: Enter: calcDiff3LineListUsingAB
org.kde.kdiff3: Leave: calcDiff3LineListUsingAB
org.kde.kdiff3: "Diff: A <-> C"
org.kde.kdiff3: "Diff: B <-> C"
org.kde.kdiff3: "Severe Internal Error." line != i for srcSelector= 1
EXPECTED RESULT
The merge conflict should open
SOFTWARE/OS VERSIONS
Linux/KDE Plasma: Arch Linux
(available in About System)
KDE Plasma Version: 5.22.5
KDE Frameworks Version: 5.85.0
Qt Version: 5.15.2
Kdiff3 1.9.3 (64 bit)
ADDITIONAL INFORMATION
My gitconfig has
[merge]
tool = kdiff3
conflictstyle = diff3
if that matters. When I delete the attached kdiff3rc file the merge succeeds.
--
You are receiving this mail because:
You are watching all bug changes.
