https://bugs.kde.org/show_bug.cgi?id=499772
Steffen Jaeckel <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|FIXED |--- Status|RESOLVED |REOPENED --- Comment #28 from Steffen Jaeckel <[email protected]> --- (In reply to Helga from comment #27) > (In reply to Steffen Jaeckel from comment #26) > > FTR, I'm also hitting this from time-to-time and I've tried builds from > > master and the 1.12 branch and both still produce the hang for me. > > to be clear: you sure you're running the version built from master with > b549259f1f7ab840e0bdfc2452bcadf88eab715e included? Thanks for the quick reply. # Building kdiff3 Initially I tried the following two versions: ``` $ git describe --long --always 70825c10ec51 $ git co 1.12 Switched to branch '1.12' Your branch is up to date with 'origin/1.12'. $ git describe --long --always 1.12.4-7-g98934c693abc ``` I will refer to 1.12.4-7-g98934c693abc as 1.12.4+ from now on. I built kdiff3 by cloning the repo earlier today, then running inside that folder ``` mkdir build && cd build cmake .. && make ``` To enable the self-built kdiff3 in Git I did the following: ``` git config --global mergetool.kdiff3.path "/path/to/kdiff3/build/bin/kdiff3" git config --global difftool.kdiff3.path "/path/to/kdiff3/build/bin/kdiff3" ``` and while kdiff3 was hanging I confirmed that it was indeed running kdiff3 from that path. # Further observations I also had the feeling that something got worse over time, and I've just kind of verified this feeling by trying the same on 1.12.3 ``` $ git describe --long --always 1.12.3-0-g327dd33d83d3 ``` If I take the same merge conflict, both 1.12.3 and 1.12.4+ can hang (when the window is maximized, c.f. last paragraph), but 1.12.3 was still able to close the Window via Alt+F4 and 1.12.4+ completely hangs and I have to kill the window. Also in 1.12.3 the workaround by enabling word wrap seems to be working, but not anymore in 1.12.4+. I've also tried builds with the following commits reverted ``` # for master b549259f1f7a ("Replace RecalcWordWrap threading with single-threaded execution") # for 1.12.4+ e1e39d21d193 ("FIx incomplete backport.") 4eb80dfe9cf3 ("Replace RecalcWordWrap threading with single-threaded execution") ``` and even though I can't really quantify how much better the situation is, I have the impression it is a lot better with the commits reverted. # YAW (Yet Another Workaround) FYI: I have found one way to mitigate the issue, since it only happens for me when kdiff3 is started maximized: I terminate the process, then open kdiff3 without any files, resize the window to be non-maximized (by clicking the button besides the 'X' which calls itself "Restore" when I hover over it), then close kdiff3 via 'Quit'. When I then restart git-mergetool, kdiff3 always succeeds in opening the merge in the non-maximized window. This worked for me on all branches that I tested. -- You are receiving this mail because: You are watching all bug changes.
