Proposal for GoSC 2019 branch integration

[Gilles Caulier]

Le jeu. 5 sept. 2019 à 07:46, Gilles Caulier <caulier.gilles at gmail.com> a
écrit :

> Hi all,
>
> This is my proposal for students branches integration with next releases.
>
> 1/ Clone tool => As it's a plugin with minor core changes.
> 2/ Face recognition => a lots of code changed everywhere in core.
> 3/ Face Management => changes in core.
>
> 1 => git/master with next 6.4.0
>

Done. Git master now include Clone tool with the goal to be released with
next 6.4.0


> 2+3 => fusionned in a new development branch
> named remotes/origin/development/7.0.0
>
>
Done. both students remotes branches was fusionned in new one named 7.0.0
In fact i cloned the face recognition to 7.0.0 with a previous sync with
master. In a second stage i merged the Face Management branch to 7.0.0
branch, without conflict.

[gilles at localhost 6.x (7.0.0)]$ git branch
* 7.0.0
 gsoc19-face-recognition
 gsoc19-faces-workflow
 gsoc19-healing-tool
 master
[gilles at localhost 6.x (7.0.0)]$ git merge gsoc19-faces-workflow
Auto-merging core/app/views/sidebar/leftsidebarwidgets.cpp

Merge made by the 'recursive' strategy.
core/app/dragdrop/itemdragdrop.cpp                | 51
+++++++++++++++++++++++++++++++++++++++++++++++++++
core/app/filters/filtersidebarwidget.cpp          | 68
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
core/app/items/delegate/itemfacedelegate.cpp      | 13 ++++++++++++-
core/app/main/digikamapp.cpp                      |  4 +++-
core/app/main/digikamapp.h                        |  1 +
core/app/views/sidebar/leftsidebarwidgets.cpp     | 15 +++++++++++++--
core/libs/album/engine/albumthumbnailloader.cpp   | 40
++++++++++++++++++++++++++++++++++------
core/libs/album/manager/albummanager.h            | 10 +++++++++-
core/libs/album/manager/albummanager_falbum.cpp   | 15 +++++++++++++--
core/libs/album/manager/albummanager_p.h          |  2 ++
core/libs/album/treeview/tagtreeview.cpp          | 20 ++++++++++++++++++++
core/libs/album/treeview/tagtreeview.h            |  4 ++++
core/libs/database/coredb/coredb.cpp              | 35
+++++++++++++++++++++++++++++------
core/libs/database/coredb/coredb.h                |  6 ++++++
core/libs/models/albumfiltermodel.cpp             | 17 +++++++++++++++++
core/libs/models/albummodel.cpp                   | 24 +++++++++++++++++++
-----
core/libs/models/albummodel.h                     |  4 ++++
core/libs/properties/captions/itemdescedittab.cpp |  3 +++
core/libs/tags/engine/taggingactionfactory.cpp    |  7 +++++--
core/libs/tags/manager/tagsmanager.cpp            |  3 +++
core/libs/tags/widgets/tagfolderview.cpp          | 59
++++++++++++++++++++++++++---------------------------------
21 files changed, 341 insertions(+), 60 deletions(-)
[gilles at localhost 6.x (7.0.0)]$

I tested, 7.0.0 accept to be merged with master changes. So all is fine to
continue in 7.0.0 and to maintain in the same time master with 6.4.0 code.

So to resume :
- origin/master = 6.4.0 with Clone tool
- development/7.0.0 = face recognition + face management + last changes
from master.

No future commit must be done in students branches used while GsOC 2019.

Best

Gilles Caulier

>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/digikam-devel/attachments/20190906/d3c396b5/attachment.html>