<div dir="ltr"><div><div><span id="gmail-result_box" class="gmail-" lang="en"><span class="gmail-">Either the git server problem or a browser reload problem.</span> <span class="gmail-">The change is between:<br></span></span><span id="gmail-result_box" class="gmail-" lang="en"><span class="gmail-"></span></span><span id="gmail-result_box" class="gmail-" lang="en"><span class="gmail-"></span></span>2018-01-03<a href="https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=817ead8eda7dc68de58bd1c4951f1392f148ba65">we are making a combined update from V7/8 to V9, removing indexes and foreign...</a><br></div>and:<br>2018-01-04<a href="https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=6748d0fe999eb1d48437c100762299873958e85a">compile</a><br><br></div>Maik<br><div><div><span id="gmail-result_box" class="gmail-" lang="en"><span class="gmail-"></span></span></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">2018-02-13 15:20 GMT+01:00 Maik Qualmann <span dir="ltr"><<a href="mailto:metzpinguin@gmail.com" target="_blank">metzpinguin@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><div><span id="m_-824530854342714097gmail-result_box" class="m_-824530854342714097gmail-short_text" lang="en"><span class="m_-824530854342714097gmail-">Very strange, the change happens between:<br></span></span>2018-01-04 <a href="https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=2016012b9a2ee83c88f5139c56dba58b18c7b5ed" target="_blank">Changing file permissions to remove execute bit</a><br></div>and:<br>2018-01-04<a href="https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=06eae65972016ff4e80f91ffff9f3e85dd6114ab" target="_blank">polish</a><br><br><span id="m_-824530854342714097gmail-result_box" class="m_-824530854342714097gmail-" lang="en"><span class="m_-824530854342714097gmail-">It seems to be more affected, even a patch to the Panorama tool.<br>As it stands, some things have been reset from this merge, but not everything.<br>I'll fix it tonight ... Does the git server have a problem?<br><br></span></span>2017-08-17<a href="https://cgit.kde.org/digikam.git/commit/?h=development/6.0.0&id=3886bcd2d0432ea1a3eeceed51949d2552a8c770" target="_blank">Merge branch 'master' of git://anongit.kde.org/digikam into gsoc17-dlna</a><span class="HOEnZb"><font color="#888888"><br><br></font></span></div><span class="HOEnZb"><font color="#888888">Maik<br><div><div><span id="m_-824530854342714097gmail-result_box" class="m_-824530854342714097gmail-short_text" lang="en"><span class="m_-824530854342714097gmail-"></span></span></div></div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">2018-02-13 12:51 GMT+01:00 Gilles Caulier <span dir="ltr"><<a href="mailto:caulier.gilles@gmail.com" target="_blank">caulier.gilles@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Really ?<div><br></div><div>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...</div><div><br></div><div>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 ?</div><span class="m_-824530854342714097HOEnZb"><font color="#888888"><div><br></div><div>Gilles</div></font></span></div><div class="m_-824530854342714097HOEnZb"><div class="m_-824530854342714097h5"><div class="gmail_extra"><br><div class="gmail_quote">2018-02-13 12:42 GMT+01:00 Maik Qualmann <span dir="ltr"><<a href="mailto:metzpinguin@gmail.com" target="_blank">metzpinguin@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Gilles, the merge from 5.8.0 to 6.0.0 is not complete. I had already wondered<br>
that 6.0.0 reacts worse on threads again. Do we have a chance to check what<br>
else is missing?<br>
<br>
master:<br>
<a href="https://cgit.kde.org/digikam.git/tree/libs/threads/actionthreadbase.cpp#n69" rel="noreferrer" target="_blank">https://cgit.kde.org/digikam.g<wbr>it/tree/libs/threads/actionthr<wbr>eadbase.cpp#n69</a><br>
<a href="https://cgit.kde.org/digikam.git/tree/libs/threads/actionthreadbase.cpp#n88" rel="noreferrer" target="_blank">https://cgit.kde.org/digikam.g<wbr>it/tree/libs/threads/actionthr<wbr>eadbase.cpp#n88</a><br>
<br>
<br>
6.0.0:<br>
<a href="https://cgit.kde.org/digikam.git/tree/libs/threads/actionthreadbase.cpp?h=development/6.0.0#n69" rel="noreferrer" target="_blank">https://cgit.kde.org/digikam.g<wbr>it/tree/libs/threads/actionthr<wbr>eadbase.cpp?<br>
h=development/6.0.0#n69</a><br>
<a href="https://cgit.kde.org/digikam.git/tree/libs/threads/actionthreadbase.cpp?h=development/6.0.0#n87" rel="noreferrer" target="_blank">https://cgit.kde.org/digikam.g<wbr>it/tree/libs/threads/actionthr<wbr>eadbase.cpp?<br>
h=development/6.0.0#n87</a><br>
<span class="m_-824530854342714097m_-6334475479046842512HOEnZb"><font color="#888888"><br>
Maik<br>
<br>
<br>
</font></span></blockquote></div><br></div>
</div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>