GoSC 2010 sync with trunk : errors...

[Gilles Caulier-4]

I tried to sync gosc2010 branch with trunk. There are a lots of error
due to last changes in trunk :

[gilles@localhost digikam]$ svn merge -r1193903:HEAD
svn+ssh://[hidden email]/home/kde/trunk/extragear/graphics/digikam
--- Fusion de r1193904 à r1196621 dans '.':
U    imageplugins/enhance/hotpixels/weights.h
U    imageplugins/enhance/hotpixels/hotpixel.h
U    imageplugins/enhance/hotpixels/weights.cpp
U    imageplugins/enhance/blurtool.cpp
U    imageplugins/decorate/superimpose/superimpose.h
U    tests/CMakeLists.txt
A    project/nsis
A    project/nsis/TODO
A    project/nsis/COPYING
A    project/nsis/digikam_header.bmp
A    project/nsis/digikam.nsi
A    project/nsis/digikam_welcome.bmp
Conflit découvert dans 'NEWS'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    NEWS
U    kioslave/digikamalbums.cpp
U    CMakeLists.txt
U    themedesigner/CMakeLists.txt
U    libs/dimg/dimg.cpp
U    libs/dimg/filters/icc/icctransform.cpp
Conflit découvert dans 'libs/dimg/filters/curves/imagecurves.cpp'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    libs/dimg/filters/curves/imagecurves.cpp
Conflit découvert dans 'libs/dimg/filters/fx/blurfilter.cpp'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    libs/dimg/filters/fx/blurfilter.cpp
Conflit découvert dans 'libs/dimg/filters/fx/blurfilter.h'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    libs/dimg/filters/fx/blurfilter.h
U    libs/dialogs/libsinfodlg.cpp
U    libs/threadimageio/thumbnailsize.h
U    libs/models/abstractalbummodel.cpp
U    libs/models/imagefiltersettings.cpp
Conflit découvert dans 'libs/models/imagefiltermodel.cpp'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    libs/models/imagefiltermodel.cpp
Conflit découvert dans 'libs/models/abstractalbummodel.h'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    libs/models/abstractalbummodel.h
Conflit découvert dans 'libs/models/imagefiltersettings.h'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    libs/models/imagefiltersettings.h
U    libs/models/imagefiltermodel.h
U    libs/database/databasebackend.cpp
U    libs/database/databasecorebackend.h
U    libs/database/databasebackend.h
U    libs/database/imagequerybuilder.cpp
U    libs/database/haar/haar.h
U    digikam/digikamview.cpp
U    digikam/albumselectcombobox.h
Conflit découvert dans 'digikam/imagedelegate.h'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    digikam/imagedelegate.h
U    digikam/imagecategorydrawer.h
U    digikam/databaseguierrorhandler.h
U    digikam/tagcheckview.h
U    digikam/imagethumbnaildelegate.cpp
U    digikam/albummanager.cpp
U    digikam/digikamview.h
U    digikam/albumtreeview.h
U    digikam/dio.h
Conflit découvert dans 'digikam/albumselectcombobox.cpp'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    digikam/albumselectcombobox.cpp
U    digikam/digikammodelcollection.cpp
Conflit découvert dans 'digikam/digikamimagedelegate.cpp'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    digikam/digikamimagedelegate.cpp
U    digikam/tagcheckview.cpp
U    digikam/albumtreeview.cpp
U    digikam/dio.cpp
Conflit découvert dans 'digikam/imagedelegate.cpp'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    digikam/imagedelegate.cpp
Conflit découvert dans 'digikam/imagedelegatepriv.h'.
Sélectionner : (p) report, (df) diff entier, (e) édite,
        (mc) mes conflits, (tc) autres conflits,
        (s) affiche toutes les options : p
C    digikam/imagedelegatepriv.h
U    digikam/tagfiltersidebarwidget.h
U    digikam/imagecategorydrawer.cpp
U    digikam/imagethumbnaildelegate.h
U    digikam/CMakeLists.txt
U    digikam/digikammodelcollection.h
U    digikam/tagfiltersidebarwidget.cpp
U    digikam/databaseguierrorhandler.cpp
U    utilities/queuemanager/basetools/enhance/blur.cpp
U    utilities/queuemanager/basetools/enhance/blur.h
U    utilities/imageeditor/editor/editorwindow.cpp
U    utilities/imageeditor/widgets/imageguidewidget.cpp
U    utilities/advancedrename/advancedrenamemanager.cpp
U    utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.ui
U    utilities/advancedrename/parser/options/sequencenumberoption.cpp
A    utilities/advancedrename/CMakeLists.txt
U    utilities/advancedrename/advancedrenamemanager.h
U    utilities/fuzzysearch/sketchwidget.cpp
U    utilities/fuzzysearch/fuzzysearchview.cpp
U    utilities/fuzzysearch/sketchwidget.h
U    utilities/fuzzysearch/fuzzysearchview.h
U    utilities/CMakeLists.txt
U    config-digikam.h.cmake
Résumé des conflits :
  Conflits textuels : 12

Gilles
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

Andi, Marcel,

I fixed all with commit #1197683.

But, it's very important to review my merge 3 files where i'm not fully sure :

[gilles@localhost digikam]$ svn merge -r1193903:HEAD
svn+ssh://[hidden email]/home/kde/trunk/extragear/graphics/digikam
--- Merging r1193904 through r1197592 into '.':
U    imageplugins/enhance/hotpixels/weights.h
U    imageplugins/enhance/hotpixels/hotpixel.h
U    imageplugins/enhance/hotpixels/weights.cpp
U    imageplugins/enhance/blurtool.cpp
U    imageplugins/decorate/superimpose/superimpose.h
U    tests/CMakeLists.txt
A    project/nsis
A    project/nsis/TODO
A    project/nsis/COPYING
A    project/nsis/digikam_header.bmp
A    project/nsis/digikam.nsi
A    project/nsis/digikam_welcome.bmp
F    NEWS
U    kioslave/digikamalbums.cpp
U    CMakeLists.txt
U    themedesigner/CMakeLists.txt
U    libs/imageproperties/imagepropertiescolorstab.cpp
U    libs/imageproperties/imagepropertiessidebarcamgui.cpp
U    libs/dimg/dimg.cpp
U    libs/dimg/filters/nr/nrsettings.cpp
U    libs/dimg/filters/icc/icctransform.cpp
F    libs/dimg/filters/curves/imagecurves.cpp
F    libs/dimg/filters/fx/blurfilter.cpp
F    libs/dimg/filters/fx/blurfilter.h
U    libs/dialogs/libsinfodlg.cpp
U    libs/threadimageio/thumbnailcreator.cpp
F    libs/threadimageio/thumbnailloadthread.cpp
         !!!!!!!!!! Check method ThumbnailLoadThread::find()
U    libs/threadimageio/thumbnailsize.h
U    libs/threadimageio/loadsavetask.h
U    libs/models/abstractalbummodel.cpp
U    libs/models/imagefiltersettings.cpp
F    libs/models/imagefiltermodel.cpp
F    libs/models/abstractalbummodel.h
F    libs/models/imagefiltersettings.h
U    libs/models/imagefiltermodel.h
U    libs/database/albuminfo.h
U    libs/database/collectionscanner.cpp
F    libs/database/albumdb.cpp
U    libs/database/databasebackend.cpp
U    libs/database/collectionmanager.cpp
U    libs/database/databasecorebackend.h
F    libs/database/albumdb.h
U    libs/database/databasebackend.h
U    libs/database/imagequerybuilder.cpp
U    libs/database/thumbnaildb.cpp
U    libs/database/haar/haar.h
U    libs/widgets/common/sidebar.cpp
U    libs/widgets/common/paniconwidget.cpp
U    libs/widgets/common/dpopupmenu.cpp
U    libs/widgets/common/filesaveoptionsbox.cpp
F    digikam/digikamview.cpp
F    digikam/leftsidebarwidgets.cpp
U    digikam/albumselectcombobox.h
F    digikam/imagedelegate.h
F    digikam/digikamapp_p.h
U    digikam/imagecategorydrawer.h
U    digikam/digikamimageview.cpp
U    digikam/databaseguierrorhandler.h
F    digikam/imagecategorizedview.cpp
U    digikam/tagcheckview.h
U    digikam/imagethumbnaildelegate.cpp
U    digikam/digikamimageview_p.cpp
U    digikam/monthwidget.cpp
F    digikam/albummanager.cpp
U    digikam/imageviewutilities.cpp
F    digikam/digikamimageview_p.h
U    digikam/scancontroller.cpp
U    digikam/digikamview.h
U    digikam/tagspopupmenu.cpp
U    digikam/albumtreeview.h
U    digikam/dio.h
F    digikam/albumsettings.cpp
F    digikam/albumselectcombobox.cpp
        !!!!!! Check method AlbumSelectComboBox::updateText()
U    digikam/digikammodelcollection.cpp
F    digikam/digikamimagedelegate.cpp
U    digikam/tagcheckview.cpp
U    digikam/syncjob.cpp
U    digikam/albumtreeview.cpp
U    digikam/dio.cpp
F    digikam/imagedelegate.cpp
              !!!!!! Check method ImageDelegate::paint()
F    digikam/imagedelegatepriv.h
U    digikam/tagfiltersidebarwidget.h
U    digikam/imagecategorydrawer.cpp
U    digikam/imagethumbnaildelegate.h
U    digikam/CMakeLists.txt
U    digikam/albumselectwidget.cpp
U    digikam/digikammodelcollection.h
U    digikam/tagfiltersidebarwidget.cpp
U    digikam/databaseguierrorhandler.cpp
U    utilities/queuemanager/basetools/enhance/blur.cpp
U    utilities/queuemanager/basetools/enhance/blur.h
U    utilities/queuemanager/basetools/transform/rotate.cpp
U    utilities/queuemanager/iteminfoset.h
U    utilities/batch/batchthumbsgenerator.cpp
U    utilities/imageeditor/editor/imagewindow.cpp
U    utilities/imageeditor/editor/editorwindow.cpp
U    utilities/imageeditor/widgets/imageguidewidget.cpp
U    utilities/imageeditor/canvas/dimginterface.cpp
A    utilities/advancedrename/advancedrenameprocessdialog.h
U    utilities/advancedrename/advancedrenamewidget.cpp
D    utilities/advancedrename/common/renamethread.cpp
D    utilities/advancedrename/common/renamethread.h
U    utilities/advancedrename/advancedrenamemanager.cpp
U    utilities/advancedrename/parser/options/database/dbkeyselector.cpp
U    utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
U    utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
U    utilities/advancedrename/parser/options/database/databaseoption.cpp
U    utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.ui
U    utilities/advancedrename/parser/options/sequencenumberoption.cpp
A    utilities/advancedrename/CMakeLists.txt
A    utilities/advancedrename/advancedrenameprocessdialog.cpp
U    utilities/advancedrename/advancedrenamedialog.cpp
U    utilities/advancedrename/advancedrenameinput.cpp
U    utilities/advancedrename/advancedrenamemanager.h
U    utilities/cameragui/camerafolderitem.cpp
F    utilities/setup/setupmetadata.cpp
U    utilities/setup/setupicc.cpp
U    utilities/fuzzysearch/sketchwidget.cpp
U    utilities/fuzzysearch/fuzzysearchview.cpp
U    utilities/fuzzysearch/sketchwidget.h
U    utilities/fuzzysearch/fuzzysearchview.h
U    utilities/CMakeLists.txt
U    config-digikam.h.cmake
Summary of conflicts:
  Text conflicts: 23

Thanks in advance

Gilles Caulier

Le 13 novembre 2010 19:04, Gilles Caulier <[hidden email]> a écrit :

> I tried to sync gosc2010 branch with trunk. There are a lots of error
> due to last changes in trunk :
>
> [gilles@localhost digikam]$ svn merge -r1193903:HEAD
> svn+ssh://[hidden email]/home/kde/trunk/extragear/graphics/digikam
> --- Fusion de r1193904 à r1196621 dans '.':
> U    imageplugins/enhance/hotpixels/weights.h
> U    imageplugins/enhance/hotpixels/hotpixel.h
> U    imageplugins/enhance/hotpixels/weights.cpp
> U    imageplugins/enhance/blurtool.cpp
> U    imageplugins/decorate/superimpose/superimpose.h
> U    tests/CMakeLists.txt
> A    project/nsis
> A    project/nsis/TODO
> A    project/nsis/COPYING
> A    project/nsis/digikam_header.bmp
> A    project/nsis/digikam.nsi
> A    project/nsis/digikam_welcome.bmp
> Conflit découvert dans 'NEWS'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    NEWS
> U    kioslave/digikamalbums.cpp
> U    CMakeLists.txt
> U    themedesigner/CMakeLists.txt
> U    libs/dimg/dimg.cpp
> U    libs/dimg/filters/icc/icctransform.cpp
> Conflit découvert dans 'libs/dimg/filters/curves/imagecurves.cpp'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    libs/dimg/filters/curves/imagecurves.cpp
> Conflit découvert dans 'libs/dimg/filters/fx/blurfilter.cpp'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    libs/dimg/filters/fx/blurfilter.cpp
> Conflit découvert dans 'libs/dimg/filters/fx/blurfilter.h'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    libs/dimg/filters/fx/blurfilter.h
> U    libs/dialogs/libsinfodlg.cpp
> U    libs/threadimageio/thumbnailsize.h
> U    libs/models/abstractalbummodel.cpp
> U    libs/models/imagefiltersettings.cpp
> Conflit découvert dans 'libs/models/imagefiltermodel.cpp'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    libs/models/imagefiltermodel.cpp
> Conflit découvert dans 'libs/models/abstractalbummodel.h'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    libs/models/abstractalbummodel.h
> Conflit découvert dans 'libs/models/imagefiltersettings.h'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    libs/models/imagefiltersettings.h
> U    libs/models/imagefiltermodel.h
> U    libs/database/databasebackend.cpp
> U    libs/database/databasecorebackend.h
> U    libs/database/databasebackend.h
> U    libs/database/imagequerybuilder.cpp
> U    libs/database/haar/haar.h
> U    digikam/digikamview.cpp
> U    digikam/albumselectcombobox.h
> Conflit découvert dans 'digikam/imagedelegate.h'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    digikam/imagedelegate.h
> U    digikam/imagecategorydrawer.h
> U    digikam/databaseguierrorhandler.h
> U    digikam/tagcheckview.h
> U    digikam/imagethumbnaildelegate.cpp
> U    digikam/albummanager.cpp
> U    digikam/digikamview.h
> U    digikam/albumtreeview.h
> U    digikam/dio.h
> Conflit découvert dans 'digikam/albumselectcombobox.cpp'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    digikam/albumselectcombobox.cpp
> U    digikam/digikammodelcollection.cpp
> Conflit découvert dans 'digikam/digikamimagedelegate.cpp'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    digikam/digikamimagedelegate.cpp
> U    digikam/tagcheckview.cpp
> U    digikam/albumtreeview.cpp
> U    digikam/dio.cpp
> Conflit découvert dans 'digikam/imagedelegate.cpp'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    digikam/imagedelegate.cpp
> Conflit découvert dans 'digikam/imagedelegatepriv.h'.
> Sélectionner : (p) report, (df) diff entier, (e) édite,
>        (mc) mes conflits, (tc) autres conflits,
>        (s) affiche toutes les options : p
> C    digikam/imagedelegatepriv.h
> U    digikam/tagfiltersidebarwidget.h
> U    digikam/imagecategorydrawer.cpp
> U    digikam/imagethumbnaildelegate.h
> U    digikam/CMakeLists.txt
> U    digikam/digikammodelcollection.h
> U    digikam/tagfiltersidebarwidget.cpp
> U    digikam/databaseguierrorhandler.cpp
> U    utilities/queuemanager/basetools/enhance/blur.cpp
> U    utilities/queuemanager/basetools/enhance/blur.h
> U    utilities/imageeditor/editor/editorwindow.cpp
> U    utilities/imageeditor/widgets/imageguidewidget.cpp
> U    utilities/advancedrename/advancedrenamemanager.cpp
> U    utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.ui
> U    utilities/advancedrename/parser/options/sequencenumberoption.cpp
> A    utilities/advancedrename/CMakeLists.txt
> U    utilities/advancedrename/advancedrenamemanager.h
> U    utilities/fuzzysearch/sketchwidget.cpp
> U    utilities/fuzzysearch/fuzzysearchview.cpp
> U    utilities/fuzzysearch/sketchwidget.h
> U    utilities/fuzzysearch/fuzzysearchview.h
> U    utilities/CMakeLists.txt
> U    config-digikam.h.cmake
> Résumé des conflits :
>  Conflits textuels : 12
>
> Gilles
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> Andi, Marcel,
>
> I fixed all with commit #1197683.
>
> But, it's very important to review my merge 3 files where i'm not fully
> sure :

I have reviewed the full patch. With many trivial changes I cannot rule out to
have missed something, but with the exception of one problem in imagedelegate
which I fixed it seems fine.

Marcel
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

Thanks Marcel.

Gilles

2010/11/17 Marcel Wiesweg <[hidden email]>:

>
>> Andi, Marcel,
>>
>> I fixed all with commit #1197683.
>>
>> But, it's very important to review my merge 3 files where i'm not fully
>> sure :
>
> I have reviewed the full patch. With many trivial changes I cannot rule out to
> have missed something, but with the exception of one problem in imagedelegate
> which I fixed it seems fine.
>
> Marcel
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

Yes, seems to be ok...

Andi Clemens
-----------------
www.digikam.org

On Tuesday 16 November 2010 12:16:13 Gilles Caulier wrote:

> Andi, Marcel,
>
> I fixed all with commit #1197683.
>
> But, it's very important to review my merge 3 files where i'm not fully
> sure :
>
> [gilles@localhost digikam]$ svn merge -r1193903:HEAD
> svn+ssh://[hidden email]/home/kde/trunk/extragear/graphics/digikam
> --- Merging r1193904 through r1197592 into '.':
> U    imageplugins/enhance/hotpixels/weights.h
> U    imageplugins/enhance/hotpixels/hotpixel.h
> U    imageplugins/enhance/hotpixels/weights.cpp
> U    imageplugins/enhance/blurtool.cpp
> U    imageplugins/decorate/superimpose/superimpose.h
> U    tests/CMakeLists.txt
> A    project/nsis
> A    project/nsis/TODO
> A    project/nsis/COPYING
> A    project/nsis/digikam_header.bmp
> A    project/nsis/digikam.nsi
> A    project/nsis/digikam_welcome.bmp
> F    NEWS
> U    kioslave/digikamalbums.cpp
> U    CMakeLists.txt
> U    themedesigner/CMakeLists.txt
> U    libs/imageproperties/imagepropertiescolorstab.cpp
> U    libs/imageproperties/imagepropertiessidebarcamgui.cpp
> U    libs/dimg/dimg.cpp
> U    libs/dimg/filters/nr/nrsettings.cpp
> U    libs/dimg/filters/icc/icctransform.cpp
> F    libs/dimg/filters/curves/imagecurves.cpp
> F    libs/dimg/filters/fx/blurfilter.cpp
> F    libs/dimg/filters/fx/blurfilter.h
> U    libs/dialogs/libsinfodlg.cpp
> U    libs/threadimageio/thumbnailcreator.cpp
> F    libs/threadimageio/thumbnailloadthread.cpp
>          !!!!!!!!!! Check method ThumbnailLoadThread::find()
> U    libs/threadimageio/thumbnailsize.h
> U    libs/threadimageio/loadsavetask.h
> U    libs/models/abstractalbummodel.cpp
> U    libs/models/imagefiltersettings.cpp
> F    libs/models/imagefiltermodel.cpp
> F    libs/models/abstractalbummodel.h
> F    libs/models/imagefiltersettings.h
> U    libs/models/imagefiltermodel.h
> U    libs/database/albuminfo.h
> U    libs/database/collectionscanner.cpp
> F    libs/database/albumdb.cpp
> U    libs/database/databasebackend.cpp
> U    libs/database/collectionmanager.cpp
> U    libs/database/databasecorebackend.h
> F    libs/database/albumdb.h
> U    libs/database/databasebackend.h
> U    libs/database/imagequerybuilder.cpp
> U    libs/database/thumbnaildb.cpp
> U    libs/database/haar/haar.h
> U    libs/widgets/common/sidebar.cpp
> U    libs/widgets/common/paniconwidget.cpp
> U    libs/widgets/common/dpopupmenu.cpp
> U    libs/widgets/common/filesaveoptionsbox.cpp
> F    digikam/digikamview.cpp
> F    digikam/leftsidebarwidgets.cpp
> U    digikam/albumselectcombobox.h
> F    digikam/imagedelegate.h
> F    digikam/digikamapp_p.h
> U    digikam/imagecategorydrawer.h
> U    digikam/digikamimageview.cpp
> U    digikam/databaseguierrorhandler.h
> F    digikam/imagecategorizedview.cpp
> U    digikam/tagcheckview.h
> U    digikam/imagethumbnaildelegate.cpp
> U    digikam/digikamimageview_p.cpp
> U    digikam/monthwidget.cpp
> F    digikam/albummanager.cpp
> U    digikam/imageviewutilities.cpp
> F    digikam/digikamimageview_p.h
> U    digikam/scancontroller.cpp
> U    digikam/digikamview.h
> U    digikam/tagspopupmenu.cpp
> U    digikam/albumtreeview.h
> U    digikam/dio.h
> F    digikam/albumsettings.cpp
> F    digikam/albumselectcombobox.cpp
>         !!!!!! Check method AlbumSelectComboBox::updateText()
> U    digikam/digikammodelcollection.cpp
> F    digikam/digikamimagedelegate.cpp
> U    digikam/tagcheckview.cpp
> U    digikam/syncjob.cpp
> U    digikam/albumtreeview.cpp
> U    digikam/dio.cpp
> F    digikam/imagedelegate.cpp
>               !!!!!! Check method ImageDelegate::paint()
> F    digikam/imagedelegatepriv.h
> U    digikam/tagfiltersidebarwidget.h
> U    digikam/imagecategorydrawer.cpp
> U    digikam/imagethumbnaildelegate.h
> U    digikam/CMakeLists.txt
> U    digikam/albumselectwidget.cpp
> U    digikam/digikammodelcollection.h
> U    digikam/tagfiltersidebarwidget.cpp
> U    digikam/databaseguierrorhandler.cpp
> U    utilities/queuemanager/basetools/enhance/blur.cpp
> U    utilities/queuemanager/basetools/enhance/blur.h
> U    utilities/queuemanager/basetools/transform/rotate.cpp
> U    utilities/queuemanager/iteminfoset.h
> U    utilities/batch/batchthumbsgenerator.cpp
> U    utilities/imageeditor/editor/imagewindow.cpp
> U    utilities/imageeditor/editor/editorwindow.cpp
> U    utilities/imageeditor/widgets/imageguidewidget.cpp
> U    utilities/imageeditor/canvas/dimginterface.cpp
> A    utilities/advancedrename/advancedrenameprocessdialog.h
> U    utilities/advancedrename/advancedrenamewidget.cpp
> D    utilities/advancedrename/common/renamethread.cpp
> D    utilities/advancedrename/common/renamethread.h
> U    utilities/advancedrename/advancedrenamemanager.cpp
> U    utilities/advancedrename/parser/options/database/dbkeyselector.cpp
> U    utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
> U    utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
> U    utilities/advancedrename/parser/options/database/databaseoption.cpp
> U  
> utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.u
> i U    utilities/advancedrename/parser/options/sequencenumberoption.cpp A  
>  utilities/advancedrename/CMakeLists.txt
> A    utilities/advancedrename/advancedrenameprocessdialog.cpp
> U    utilities/advancedrename/advancedrenamedialog.cpp
> U    utilities/advancedrename/advancedrenameinput.cpp
> U    utilities/advancedrename/advancedrenamemanager.h
> U    utilities/cameragui/camerafolderitem.cpp
> F    utilities/setup/setupmetadata.cpp
> U    utilities/setup/setupicc.cpp
> U    utilities/fuzzysearch/sketchwidget.cpp
> U    utilities/fuzzysearch/fuzzysearchview.cpp
> U    utilities/fuzzysearch/sketchwidget.h
> U    utilities/fuzzysearch/fuzzysearchview.h
> U    utilities/CMakeLists.txt
> U    config-digikam.h.cmake
> Summary of conflicts:
>   Text conflicts: 23
>
> Thanks in advance
>
> Gilles Caulier
>
> Le 13 novembre 2010 19:04, Gilles Caulier <[hidden email]> a écrit

:

> > I tried to sync gosc2010 branch with trunk. There are a lots of error
> > due to last changes in trunk :
> >
> > [gilles@localhost digikam]$ svn merge -r1193903:HEAD
> > svn+ssh://[hidden email]/home/kde/trunk/extragear/graphics/digikam
> > --- Fusion de r1193904 à r1196621 dans '.':
> > U    imageplugins/enhance/hotpixels/weights.h
> > U    imageplugins/enhance/hotpixels/hotpixel.h
> > U    imageplugins/enhance/hotpixels/weights.cpp
> > U    imageplugins/enhance/blurtool.cpp
> > U    imageplugins/decorate/superimpose/superimpose.h
> > U    tests/CMakeLists.txt
> > A    project/nsis
> > A    project/nsis/TODO
> > A    project/nsis/COPYING
> > A    project/nsis/digikam_header.bmp
> > A    project/nsis/digikam.nsi
> > A    project/nsis/digikam_welcome.bmp
> > Conflit découvert dans 'NEWS'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    NEWS
> > U    kioslave/digikamalbums.cpp
> > U    CMakeLists.txt
> > U    themedesigner/CMakeLists.txt
> > U    libs/dimg/dimg.cpp
> > U    libs/dimg/filters/icc/icctransform.cpp
> > Conflit découvert dans 'libs/dimg/filters/curves/imagecurves.cpp'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    libs/dimg/filters/curves/imagecurves.cpp
> > Conflit découvert dans 'libs/dimg/filters/fx/blurfilter.cpp'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    libs/dimg/filters/fx/blurfilter.cpp
> > Conflit découvert dans 'libs/dimg/filters/fx/blurfilter.h'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    libs/dimg/filters/fx/blurfilter.h
> > U    libs/dialogs/libsinfodlg.cpp
> > U    libs/threadimageio/thumbnailsize.h
> > U    libs/models/abstractalbummodel.cpp
> > U    libs/models/imagefiltersettings.cpp
> > Conflit découvert dans 'libs/models/imagefiltermodel.cpp'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    libs/models/imagefiltermodel.cpp
> > Conflit découvert dans 'libs/models/abstractalbummodel.h'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    libs/models/abstractalbummodel.h
> > Conflit découvert dans 'libs/models/imagefiltersettings.h'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    libs/models/imagefiltersettings.h
> > U    libs/models/imagefiltermodel.h
> > U    libs/database/databasebackend.cpp
> > U    libs/database/databasecorebackend.h
> > U    libs/database/databasebackend.h
> > U    libs/database/imagequerybuilder.cpp
> > U    libs/database/haar/haar.h
> > U    digikam/digikamview.cpp
> > U    digikam/albumselectcombobox.h
> > Conflit découvert dans 'digikam/imagedelegate.h'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    digikam/imagedelegate.h
> > U    digikam/imagecategorydrawer.h
> > U    digikam/databaseguierrorhandler.h
> > U    digikam/tagcheckview.h
> > U    digikam/imagethumbnaildelegate.cpp
> > U    digikam/albummanager.cpp
> > U    digikam/digikamview.h
> > U    digikam/albumtreeview.h
> > U    digikam/dio.h
> > Conflit découvert dans 'digikam/albumselectcombobox.cpp'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    digikam/albumselectcombobox.cpp
> > U    digikam/digikammodelcollection.cpp
> > Conflit découvert dans 'digikam/digikamimagedelegate.cpp'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    digikam/digikamimagedelegate.cpp
> > U    digikam/tagcheckview.cpp
> > U    digikam/albumtreeview.cpp
> > U    digikam/dio.cpp
> > Conflit découvert dans 'digikam/imagedelegate.cpp'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    digikam/imagedelegate.cpp
> > Conflit découvert dans 'digikam/imagedelegatepriv.h'.
> > Sélectionner : (p) report, (df) diff entier, (e) édite,
> >        (mc) mes conflits, (tc) autres conflits,
> >        (s) affiche toutes les options : p
> > C    digikam/imagedelegatepriv.h
> > U    digikam/tagfiltersidebarwidget.h
> > U    digikam/imagecategorydrawer.cpp
> > U    digikam/imagethumbnaildelegate.h
> > U    digikam/CMakeLists.txt
> > U    digikam/digikammodelcollection.h
> > U    digikam/tagfiltersidebarwidget.cpp
> > U    digikam/databaseguierrorhandler.cpp
> > U    utilities/queuemanager/basetools/enhance/blur.cpp
> > U    utilities/queuemanager/basetools/enhance/blur.h
> > U    utilities/imageeditor/editor/editorwindow.cpp
> > U    utilities/imageeditor/widgets/imageguidewidget.cpp
> > U    utilities/advancedrename/advancedrenamemanager.cpp
> > U  
> >  utilities/advancedrename/parser/options/sequencenumberoptiondialogwidge
> > t.ui U  
> >  utilities/advancedrename/parser/options/sequencenumberoption.cpp A  
> >  utilities/advancedrename/CMakeLists.txt
> > U    utilities/advancedrename/advancedrenamemanager.h
> > U    utilities/fuzzysearch/sketchwidget.cpp
> > U    utilities/fuzzysearch/fuzzysearchview.cpp
> > U    utilities/fuzzysearch/sketchwidget.h
> > U    utilities/fuzzysearch/fuzzysearchview.h
> > U    utilities/CMakeLists.txt
> > U    config-digikam.h.cmake
> > Résumé des conflits :
> >  Conflits textuels : 12
> >
> > Gilles
>
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel