Merge from 5.8.0 to 6.0.0 not correct

[Maik Qualmann]

Either the git server problem or a browser reload problem. The change is
between:
2018-01-03we are making a combined update from V7/8 to V9, removing indexes
and foreign...
<https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=817ead8eda7dc68de58bd1c4951f1392f148ba65>
and:
2018-01-04compile
<https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=6748d0fe999eb1d48437c100762299873958e85a>

Maik

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

> Very strange, the change happens between:
> 2018-01-04 Changing file permissions to remove execute bit
> <https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=2016012b9a2ee83c88f5139c56dba58b18c7b5ed>
> and:
> 2018-01-04polish
> <https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=06eae65972016ff4e80f91ffff9f3e85dd6114ab>
>
> It seems to be more affected, even a patch to the Panorama tool.
> As it stands, some things have been reset from this merge, but not
> everything.
> I'll fix it tonight ... Does the git server have a problem?
>
> 2017-08-17Merge branch 'master' of git://anongit.kde.org/digikam into
> gsoc17-dlna
> <https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=3886bcd2d0432ea1a3eeceed51949d2552a8c770>
>
> Maik
>
> 2018-02-13 12:51 GMT+01:00 Gilles Caulier <caulier.gilles at gmail.com>:
>
>> 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/actionthr
>>> eadbase.cpp#n69
>>> https://cgit.kde.org/digikam.git/tree/libs/threads/actionthr
>>> eadbase.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#n69>
>>> https://cgit.kde.org/digikam.git/tree/libs/threads/actionthreadbase.cpp?
>>> h=development/6.0.0#n87
>>> <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/c46d4215/attachment.html>