[Digikam-devel] GOsC 2010 branch : problem to sync with trunk

[Gilles Caulier]

Hi all,

I'm not completely sure if GSoC branch sync with trunk is broken due
to last changes from Andy in trunk, but, at least, i post there to all
developers :

[gilles at localhost digikam]$ pwd
/mnt/data/Devel/SVN/branches/graphics/digikam
[gilles at localhost digikam]$ svn up
U    libs/models/imagealbummodel.cpp
U    libs/database/tagscache.cpp
U    libs/database/tagscache.h
U    libs/database/imagescanner.cpp
U    libs/widgets/graphicsview/itemvisibilitycontroller.cpp
U    libs/widgets/graphicsview/regionframeitem.cpp
U    libs/widgets/graphicsview/itemvisibilitycontroller.h
U    libs/widgets/graphicsview/regionframeitem.h
U    digikam/addtagscombobox.cpp
U    digikam/addtagslineedit.h
U    digikam/addtagscombobox.h
U    digikam/addtagscompletionbox.cpp
U    digikam/albumtreeview.cpp
U    digikam/addtagslineedit.cpp
U    utilities/facedetection/assignnamewidget.h
U    utilities/facedetection/facegroup.h
U    utilities/facedetection/databaseface.cpp
U    utilities/facedetection/faceiface.cpp
U    utilities/facedetection/databaseface.h
U    utilities/facedetection/assignnamewidget.cpp
U    utilities/facedetection/facegroup.cpp
U    utilities/facedetection/faceiface.h
Updated to revision 1182419.

[gilles at localhost digikam]$ svn merge -r1181547:HEAD
svn+ssh://cgilles@svn.kde.org/home/kde/trunk/extragear/graphics/digikam

Conflict discovered in 'NEWS'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r1181548 through r1182419 into '.':
C    NEWS
U    CMakeLists.txt
U    libs/dimg/filters/lens/lensfuncameraselector.cpp
U    libs/3rdparty/lensfun/README
U    HACKING
Conflict discovered in 'digikam/digikamview.cpp'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    digikam/digikamview.cpp
U    digikam/tagfolderview.cpp
U    digikam/mediaplayerview.cpp
U    digikam/digikamapp_p.h
U    digikam/digikamimageview.cpp
U    digikam/albumselectiontreeview.cpp
Conflict discovered in 'digikam/digikamui.rc'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    digikam/digikamui.rc
U    digikam/contextmenuhelper.cpp
U    digikam/digikamview.h
U    digikam/imagepreviewview.h
U    digikam/dio.cpp
Conflict discovered in 'digikam/imagepreviewview.cpp'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    digikam/imagepreviewview.cpp
U    digikam/digikam.notifyrc
U    digikam/main.cpp
U    digikam/digikamapp.cpp
U    digikam/contextmenuhelper.h
U    utilities/lighttable/lighttablewindow.cpp
U    utilities/queuemanager/actionthread.cpp
U    utilities/queuemanager/queuemgrwindow.cpp
U    utilities/queuemanager/queuemgrwindow.h
U    utilities/imageeditor/editor/editorwindow.cpp
U    utilities/cameragui/cameraui.cpp
Summary of conflicts:
  Text conflicts: 4

We don't care about NEWS file changes.
digikamui.rc can be easily fixed.

It still imagepreviewview.cpp and digikamview.cpp

Gilles