[kdiff3] [Bug 408991] Kdiff3 1.8.1 hangs on comparing two large directories
https://bugs.kde.org/show_bug.cgi?id=408991 michael changed: What|Removed |Added Latest Commit|https://cgit.kde.org/kdiff3 |https://invent.kde.org/kde/ |.git/commit/804997e45675e1e |kdiff3/commit/0737cc3e2ddf7 |a1e86559d11f118d73fca8ce0 |5fcd69efb385303e0cab3e2db48 Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #4 from michael --- Git commit 0737cc3e2ddf75fcd69efb385303e0cab3e2db48 by Michael Reeves. Committed on 26/07/2019 at 17:19. Pushed by mreeves into branch '1.8'. Fix botched merge M +5-0src/directorymergewindow.cpp https://invent.kde.org/kde/kdiff3/commit/0737cc3e2ddf75fcd69efb385303e0cab3e2db48 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 408991] Kdiff3 1.8.1 hangs on comparing two large directories
https://bugs.kde.org/show_bug.cgi?id=408991
Wolfgang Bauer changed:
What|Removed |Added
Resolution|FIXED |---
Status|RESOLVED|REOPENED
CC||wba...@tmo.at
Ever confirmed|0 |1
--- Comment #3 from Wolfgang Bauer ---
I had the same problem when comparing two folders, and I can confirm that
https://phabricator.kde.org/D22294 fixed it for me too.
But: the commit to the 1.8 branch is incomplete:
https://cgit.kde.org/kdiff3.git/commit/?h=1.8=804997e45675e1ea1e86559d11f118d73fca8ce0
It misses a (the most important?) part.
I had to add these lines (from master) to fix 1.8.1:
if(memcmp([0], [0], len) != 0)
{
bError = false;
+fi1.close();
+fi2.close();
return bEqual;
}
sizeLeft -= len;
//pp.setCurrent(double(fullSize-sizeLeft)/fullSize, false );
pp.step();
}
+fi1.close();
+fi2.close();
// If the program really arrives here, then the files are really equal.
bError = false;
Reopening therefore.
--
You are receiving this mail because:
You are watching all bug changes.
[kdiff3] [Bug 408991] Kdiff3 1.8.1 hangs on comparing two large directories
https://bugs.kde.org/show_bug.cgi?id=408991 michael changed: What|Removed |Added Latest Commit||https://cgit.kde.org/kdiff3 ||.git/commit/804997e45675e1e ||a1e86559d11f118d73fca8ce0 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 408991] Kdiff3 1.8.1 hangs on comparing two large directories
https://bugs.kde.org/show_bug.cgi?id=408991 michael changed: What|Removed |Added Resolution|--- |FIXED Status|REPORTED|RESOLVED Version Fixed In||1.8.2 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 408991] Kdiff3 1.8.1 hangs on comparing two large directories
https://bugs.kde.org/show_bug.cgi?id=408991 --- Comment #2 from Slaviro --- (In reply to michael from comment #1) > https://phabricator.kde.org/D22294 looks like it should fix your problem. > This address an issue with files not being closed. It seems to have fixed the problem -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 408991] Kdiff3 1.8.1 hangs on comparing two large directories
https://bugs.kde.org/show_bug.cgi?id=408991 --- Comment #1 from michael --- https://phabricator.kde.org/D22294 looks like it should fix your problem. This address an issue with files not being closed. -- You are receiving this mail because: You are watching all bug changes.
