Merge from 5.8.0 to 6.0.0 not correct

[Gilles Caulier]

Really ?

Hum, perhaps a sync from master to face recognition branch and later a sync
back to 6.0.0 branch is the problem, as i can see in the log. But i'm sure
to have sync all branches with master step by step before to merge in
6.0.0...

What's the result to take actionthreadbase.cpp/.h from master and to
overwrite 6.0.0 code ? do you see any special difference in c++
implementation with git diff ?

Gilles

2018-02-13 12:42 GMT+01:00 Maik Qualmann <metzpinguin at gmail.com>:

> Gilles, the merge from 5.8.0 to 6.0.0 is not complete. I had already
> wondered
> that 6.0.0 reacts worse on threads again. Do we have a chance to check what
> else is missing?
>
> master:
> https://cgit.kde.org/digikam.git/tree/libs/threads/
> actionthreadbase.cpp#n69
> https://cgit.kde.org/digikam.git/tree/libs/threads/
> actionthreadbase.cpp#n88
>
>
> 6.0.0:
> https://cgit.kde.org/digikam.git/tree/libs/threads/actionthreadbase.cpp?
> h=development/6.0.0#n69
> https://cgit.kde.org/digikam.git/tree/libs/threads/actionthreadbase.cpp?
> h=development/6.0.0#n87
>
> Maik
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/digikam-devel/attachments/20180213/fa45296a/attachment.html>