Merge from 5.8.0 to 6.0.0 not correct

[Maik Qualmann]

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

[Gilles Caulier-4]

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 <[hidden email]>:

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:
<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.git/tree/libs/threads/actionthreadbase.cpp?
h=development/6.0.0#n69
<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.git/tree/libs/threads/actionthreadbase.cpp?
h=development/6.0.0#n87

Maik

[Maik Qualmann]

Very strange, the change happens between:
2018-01-04 Changing file permissions to remove execute bit

and:
2018-01-04polish

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

Maik

2018-02-13 12:51 GMT+01:00 Gilles Caulier <[hidden email]>:

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 <[hidden email]>:

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

[Gilles Caulier-4]

I think the git server work, but I seen soem ssh problem to access to KDE server. Typically i upload the bundle files to a specific area for digiKam (files.kde.org), and the connexion was problematic while this week end. Same to get translations from svn.kde.org.

Gilles

2018-02-13 15:20 GMT+01:00 Maik Qualmann <[hidden email]>:

Very strange, the change happens between:
2018-01-04 Changing file permissions to remove execute bit

and:
2018-01-04polish

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

Maik

2018-02-13 12:51 GMT+01:00 Gilles Caulier <[hidden email]>:

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 <[hidden email]>:

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

[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...

and:
2018-01-04compile

Maik

2018-02-13 15:20 GMT+01:00 Maik Qualmann <[hidden email]>:

Very strange, the change happens between:
2018-01-04 Changing file permissions to remove execute bit

and:
2018-01-04polish

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

Maik

2018-02-13 12:51 GMT+01:00 Gilles Caulier <[hidden email]>:

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 <[hidden email]>:

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