<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le jeu. 5 sept. 2019 à 07:46, Gilles Caulier <<a href="mailto:caulier.gilles@gmail.com">caulier.gilles@gmail.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">Hi all,<br><div><br></div><div>This is my proposal for students branches integration with next releases.</div><div><br></div><div>1/ Clone tool => As it's a plugin with minor core changes.</div><div>2/ Face recognition => a lots of code changed everywhere in core.</div><div>3/ Face Management => changes in core.</div><div><br></div><div>1 => git/master with next 6.4.0</div></div></blockquote><div><br></div><div>Done. Git master now include Clone tool with the goal to be released with next 6.4.0</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>2+3 => fusionned in a new development branch named remotes/origin/development/7.0.0</div><div><br></div></div></blockquote><div><br></div><div>Done. both students remotes branches was fusionned in new one named 7.0.0</div><div>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.</div><div><br></div><div><span style="font-family:monospace"><span style="color:rgb(0,0,0)">[gilles@localhost 6.x (7.0.0)]$ git branch
</span><br>* <span style="font-weight:bold;color:rgb(84,255,84)">7.0.0</span><span style="color:rgb(0,0,0)">
</span><br> <span style="color:rgb(24,178,24)">gsoc19-face-recognition</span><span style="color:rgb(0,0,0)">
</span><br> <span style="color:rgb(24,178,24)">gsoc19-faces-workflow</span><span style="color:rgb(0,0,0)">
</span><br> <span style="color:rgb(24,178,24)">gsoc19-healing-tool</span><span style="color:rgb(0,0,0)">
</span><br> <span style="color:rgb(24,178,24)">master</span><span style="color:rgb(0,0,0)">
</span><br>[gilles@localhost 6.x (7.0.0)]$ git merge gsoc19-faces-workflow
<br>Auto-merging core/app/views/sidebar/leftsidebarwidgets.cpp
<br>
<br>Merge made by the 'recursive' strategy.
<br> core/app/dragdrop/itemdragdrop.cpp | 51 <span style="font-weight:bold;color:rgb(84,255,84)">+++++++++++++++++++++++++++++++++++++++++++++++++++</span><span style="color:rgb(0,0,0)">
</span><br> core/app/filters/filtersidebarwidget.cpp | 68 <span style="font-weight:bold;color:rgb(84,255,84)">+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">-</span><span style="color:rgb(0,0,0)">
</span><br> core/app/items/delegate/itemfacedelegate.cpp | 13 <span style="font-weight:bold;color:rgb(84,255,84)">++++++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">-</span><span style="color:rgb(0,0,0)">
</span><br> core/app/main/digikamapp.cpp | 4 <span style="font-weight:bold;color:rgb(84,255,84)">+++</span><span style="font-weight:bold;color:rgb(255,84,84)">-</span><span style="color:rgb(0,0,0)">
</span><br> core/app/main/digikamapp.h | 1 <span style="font-weight:bold;color:rgb(84,255,84)">+</span><span style="color:rgb(0,0,0)">
</span><br> core/app/views/sidebar/leftsidebarwidgets.cpp | 15 <span style="font-weight:bold;color:rgb(84,255,84)">+++++++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">--</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/album/engine/albumthumbnailloader.cpp | 40 <span style="font-weight:bold;color:rgb(84,255,84)">++++++++++++++++++++++++++++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">------</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/album/manager/albummanager.h | 10 <span style="font-weight:bold;color:rgb(84,255,84)">+++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">-</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/album/manager/albummanager_falbum.cpp | 15 <span style="font-weight:bold;color:rgb(84,255,84)">+++++++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">--</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/album/manager/albummanager_p.h | 2 <span style="font-weight:bold;color:rgb(84,255,84)">++</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/album/treeview/tagtreeview.cpp | 20 <span style="font-weight:bold;color:rgb(84,255,84)">++++++++++++++++++++</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/album/treeview/tagtreeview.h | 4 <span style="font-weight:bold;color:rgb(84,255,84)">++++</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/database/coredb/coredb.cpp | 35 <span style="font-weight:bold;color:rgb(84,255,84)">+++++++++++++++++++++++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">------</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/database/coredb/coredb.h | 6 <span style="font-weight:bold;color:rgb(84,255,84)">++++++</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/models/albumfiltermodel.cpp | 17 <span style="font-weight:bold;color:rgb(84,255,84)">+++++++++++++++++</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/models/albummodel.cpp | 24 <span style="font-weight:bold;color:rgb(84,255,84)">+++++++++++++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">-----</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/models/albummodel.h | 4 <span style="font-weight:bold;color:rgb(84,255,84)">++++</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/properties/captions/itemdescedittab.cpp | 3 <span style="font-weight:bold;color:rgb(84,255,84)">+++</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/tags/engine/taggingactionfactory.cpp | 7 <span style="font-weight:bold;color:rgb(84,255,84)">+++++</span><span style="font-weight:bold;color:rgb(255,84,84)">--</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/tags/manager/tagsmanager.cpp | 3 <span style="font-weight:bold;color:rgb(84,255,84)">+++</span><span style="color:rgb(0,0,0)">
</span><br> core/libs/tags/widgets/tagfolderview.cpp | 59 <span style="font-weight:bold;color:rgb(84,255,84)">++++++++++++++++++++++++++</span><span style="font-weight:bold;color:rgb(255,84,84)">---------------------------------</span><span style="color:rgb(0,0,0)">
</span><br> 21 files changed, 341 insertions(+), 60 deletions(-)
<br>[gilles@localhost 6.x (7.0.0)]$ <br>
<br></span></div><div><font face="monospace">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.</font></div><div><br></div><div>So to resume : </div><div>- origin/master = 6.4.0 with Clone tool</div><div>- development/7.0.0 = face recognition + face management + last changes from master.</div><div><br></div><div>No future commit must be done in students branches used while GsOC 2019.</div><div><br></div><div>Best</div><div><br></div><div>Gilles Caulier</div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
</blockquote></div></div>