[Digikam-devel] how to synchronize properly GOsC 2010 branch with trunk

[Gilles Caulier]

2010/7/23 Johannes Wienke <jwienke at techfak.uni-bielefeld.de>:
> Hi,
>
> you need to specify which revisions you want to merge into the branch.
> That means you want (trunk revisions last merge + 1):HEAD. Otherwise old
> revisions that were already merged are probably merged again. Svn isn't
> that good at tracking what was already merged.

Why ? By default svn use HEAD, as said documentation.

Gilles

>
> Johannes
>
> Gilles Caulier wrote:
>> Hi all,
>>
>> Ususally, Marcel synchronize GOsC 2010 branch with trunk. As he is
>> always in holidays, and as trunk has few important changes, it become
>> urgent to process synchronization between both.
>>
>> How to do it properly ? I tried to use "svn merge" like this :
>>
>> [gilles at localhost digikam]$ pwd
>> /mnt/data/devel/SVN/branches/gosc2010/digikam
>>
>> [gilles at localhost digikam]$ svn merge --dry-run
>> svn+ssh://cgilles@svn.kde.org/home/kde/branches/extragear/graphics/digikam
>> svn+ssh://cgilles@svn.kde.org/home/kde/trunk/extragear/graphics/digikam
>> --- Merging differences between repository URLs into '.':
>> D    TODO.FACE
>> D    TODO.QTSCRIPT
>> U    imageplugins/enhance/digikamimageplugin_enhance.desktop
>> U    imageplugins/decorate/digikamimageplugin_decorate.desktop
>> U    imageplugins/filters/digikamimageplugin_fxfilters.desktop
>> U    imageplugins/transform/digikamimageplugin_transform.desktop
>>  U   imageplugins/transform/contentawareresizetool.cpp
>>  U   imageplugins/transform/contentawareresizetool.h
>> U    imageplugins/color/autocorrectiontool.cpp
>> U    imageplugins/color/digikamimageplugin_color.desktop
>> U    imageplugins/color/bcgtool.cpp
>> U    AUTHORS
>>  U   project/NEWS.0.9.0
>>  U   project/NEWS.0.9.1
>>  U   project/NEWS.0.9.2
>>  U   project/NEWS.0.9.3
>>  U   project/NEWS.0.9.4
>>  U   project/PACKAGING
>>  U   project/documents/DBSCHEMA.ODS
>> U    data/database/dbconfig.xml.cmake
>>  U   data/icons/apps/hi128-app-digikam.png
>>  U   data/icons/apps/hisc-app-digikam.svgz
>>  U   data/icons/apps/hi48-app-digikam.png
>>  U   data/icons/apps/hi64-app-showfoto.png
>>  U   data/icons/apps/hi128-app-showfoto.png
>>  U   data/icons/apps/hisc-app-showfoto.svgz
>>  U   data/icons/apps/hi48-app-showfoto.png
>>  U   data/icons/apps/hi22-app-digikam.png
>>  U   data/icons/apps/hi32-app-digikam.png
>>  U   data/icons/apps/hi16-app-digikam.png
>>  U   data/icons/apps/hi22-app-showfoto.png
>>  U   data/icons/apps/hi32-app-showfoto.png
>>  U   data/icons/apps/CMakeLists.txt
>>  U   data/icons/apps/hi16-app-showfoto.png
>>  U   data/icons/apps/hi64-app-digikam.png
>>  U   data/icons/digikam/hi48-action-blurimage.png
>>  U   data/icons/digikam/hi64-action-invertimage.png
>>  U   data/icons/digikam/hi128-action-perspective.png
>>  U   data/icons/digikam/hi16-action-channelmixer.png
>>  U   data/icons/digikam/hi32-action-hotpixels.png
>>  U   data/icons/digikam/hi22-action-adjustcurves.png
>>  U   data/icons/digikam/hi32-action-adjustrgb.png
>>  U   data/icons/digikam/hisc-action-sharpenimage.svgz
>>  U   data/icons/digikam/hi16-action-distortionfx.png
>>  U   data/icons/digikam/hi32-action-freerotation.png
>>  U   data/icons/digikam/hi48-action-contrast.png
>>  U   data/icons/digikam/hi32-action-imagecomment.png
>>  U   data/icons/digikam/hi16-action-adjustlevels.png
>>  U   data/icons/digikam/hi48-action-ratiocrop.png
>>  U   data/icons/digikam/hi22-action-bordertool.png
>>  U   data/icons/digikam/hi64-action-bwtonal.png
>>  U   data/icons/digikam/hisc-action-whitebalance.svgz
>>  U   data/icons/digikam/hi64-action-filmgrain.png
>>  U   data/icons/digikam/hi128-action-autocorrection.png
>>  U   data/icons/digikam/hi128-action-inpainting.png
>>  U   data/icons/digikam/hi32-action-editimage.png
>>  U   data/icons/digikam/hisc-action-imagecomment.svgz
>>  U   data/icons/digikam/hi32-action-autocorrection.png
>>  U   data/icons/digikam/hisc-action-superimpose.svgz
>>  U   data/icons/digikam/hi32-action-shear.png
>>  U   data/icons/digikam/hi32-action-sharpenimage.png
>>  U   data/icons/digikam/hi16-action-shear.png
>>  U   data/icons/digikam/hi128-action-hotpixels.png
>>  U   data/icons/digikam/hi22-action-invertimage.png
>>  U   data/icons/digikam/hi32-action-restoration.png
>>  U   data/icons/digikam/hi128-action-adjustrgb.png
>>  U   data/icons/digikam/hi16-action-bordertool.png
>>  U   data/icons/digikam/hi32-action-channelmixer.png
>>  U   data/icons/digikam/hisc-action-editimage.svgz
>>  U   data/icons/digikam/hi64-action-superimpose.png
>>  U   data/icons/digikam/hi128-action-antivignetting.png
>>  U   data/icons/digikam/hi32-action-perspective.png
>>  U   data/icons/digikam/hi48-action-adjustcurves.png
>>  U   data/icons/digikam/hi32-action-antivignetting.png
>>  U   data/icons/digikam/hi32-action-distortionfx.png
>>  U   data/icons/digikam/hi22-action-inpainting.png
>>  U   data/icons/digikam/hi32-action-adjustlevels.png
>>  U   data/icons/digikam/hi16-action-bwtonal.png
>>  U   data/icons/digikam/hi128-action-whitebalance.png
>>  U   data/icons/digikam/hi128-action-editimage.png
>>  U   data/icons/digikam/hi48-action-colormanagement.png
>>  U   data/icons/digikam/hi48-action-bordertool.png
>>  U   data/icons/digikam/hisc-action-inpainting.svgz
>>  U   data/icons/digikam/hisc-action-adjustlevels.svgz
>>  U   data/icons/digikam/hi128-action-depth8to16.png
>>  U   data/icons/digikam/hi32-action-contrast.png
>>  U   data/icons/digikam/hi22-action-texture.png
>>  U   data/icons/digikam/hi16-action-autocorrection.png
>>  U   data/icons/digikam/hi16-action-inpainting.png
>>  U   data/icons/digikam/hi16-action-blurimage.png
>>  U   data/icons/digikam/hi22-action-superimpose.png
>>  U   data/icons/digikam/hi48-action-restoration.png
>>  U   data/icons/digikam/hi128-action-noisereduction.png
>>  U   data/icons/digikam/hi48-action-hotpixels.png
>>  U   data/icons/digikam/hi64-action-adjustcurves.png
>>  U   data/icons/digikam/hi128-action-freerotation.png
>>  U   data/icons/digikam/hi32-action-noisereduction.png
>>  U   data/icons/digikam/hi128-action-imagecomment.png
>>  U   data/icons/digikam/hi48-action-adjustrgb.png
>>  U   data/icons/digikam/hi16-action-antivignetting.png
>>  U   data/icons/digikam/hi128-action-bwtonal.png
>>  U   data/icons/digikam/hi48-action-perspective.png
>>  U   data/icons/digikam/hi22-action-blurfx.png
>>  U   data/icons/digikam/hi16-action-ratiocrop.png
>>  U   data/icons/digikam/hi22-action-depth8to16.png
>>  U   data/icons/digikam/hi64-action-blurfx.png
>>  U   data/icons/digikam/hi48-action-inpainting.png
>>  U   data/icons/digikam/hi32-action-filmgrain.png
>>  U   data/icons/digikam/hi32-action-colormanagement.png
>>  U   data/icons/digikam/hi48-action-bwtonal.png
>>  U   data/icons/digikam/hi128-action-sharpenimage.png
>>  U   data/icons/digikam/hi128-action-depth16to8.png
>>  U   data/icons/digikam/hisc-action-filmgrain.svgz
>>  U   data/icons/digikam/hi48-action-editimage.png
>>  U   data/icons/digikam/hisc-action-restoration.svgz
>>  U   data/icons/digikam/hi128-action-channelmixer.png
>>  U   data/icons/digikam/hi22-action-blurimage.png
>>  U   data/icons/digikam/hi16-action-depth8to16.png
>>  U   data/icons/digikam/hi16-action-exifinfo.png
>>  U   data/icons/digikam/hi16-action-invertimage.png
>>  U   data/icons/digikam/hisc-action-perspective.svgz
>>  U   data/icons/digikam/hi128-action-distortionfx.png
>>  U   data/icons/digikam/hi22-action-whitebalance.png
>>  U   data/icons/digikam/hi128-action-adjustlevels.png
>>  U   data/icons/digikam/hi16-action-noisereduction.png
>>  U   data/icons/digikam/hi128-action-filmgrain.png
>>  U   data/icons/digikam/hi22-action-autocorrection.png
>>  U   data/icons/digikam/hi22-action-ratiocrop.png
>>  U   data/icons/digikam/hi22-action-depth16to8.png
>>  U   data/icons/digikam/hi64-action-autocorrection.png
>>  U   data/icons/digikam/hisc-action-adjustcurves.svgz
>>  U   data/icons/digikam/hi48-action-blurfx.png
>>  U   data/icons/digikam/hi64-action-exifinfo.png
>>  U   data/icons/digikam/hi48-action-depth8to16.png
>>  U   data/icons/digikam/hi16-action-adjustcurves.png
>>  U   data/icons/digikam/hisc-action-ratiocrop.svgz
>>  U   data/icons/digikam/hi128-action-blurfx.png
>>  U   data/icons/digikam/hi22-action-antivignetting.png
>>  U   data/icons/digikam/hi64-action-antivignetting.png
>>  U   data/icons/digikam/hi22-action-freerotation.png
>>  U   data/icons/digikam/hi128-action-invertimage.png
>>  U   data/icons/digikam/hi32-action-texture.png
>>  U   data/icons/digikam/hi32-action-blurfx.png
>>  U   data/icons/digikam/hi22-action-imagecomment.png
>>  U   data/icons/digikam/hisc-action-hotpixels.svgz
>>  U   data/icons/digikam/hi16-action-depth16to8.png
>>  U   data/icons/digikam/hi32-action-bordertool.png
>>  U   data/icons/digikam/hi64-action-blurimage.png
>>  U   data/icons/digikam/hi16-action-superimpose.png
>>  U   data/icons/digikam/hi64-action-restoration.png
>>  U   data/icons/digikam/hi16-action-hotpixels.png
>>  U   data/icons/digikam/hisc-action-contrast.svgz
>>  U   data/icons/digikam/hi16-action-adjustrgb.png
>>  U   data/icons/digikam/hisc-action-shear.svgz
>>  U   data/icons/digikam/hi48-action-whitebalance.png
>>  U   data/icons/digikam/hi64-action-perspective.png
>>  U   data/icons/digikam/hi22-action-sharpenimage.png
>>  U   data/icons/digikam/hi64-action-ratiocrop.png
>>  U   data/icons/digikam/hi48-action-autocorrection.png
>>  U   data/icons/digikam/hi22-action-colormanagement.png
>>  U   data/icons/digikam/hi22-action-channelmixer.png
>>  U   data/icons/digikam/hi16-action-colormanagement.png
>>  U   data/icons/digikam/hi48-action-depth16to8.png
>>  U   data/icons/digikam/hi48-action-filmgrain.png
>>  U   data/icons/digikam/hi64-action-bordertool.png
>>  U   data/icons/digikam/hi32-action-adjustcurves.png
>>  U   data/icons/digikam/hi22-action-noisereduction.png
>>  U   data/icons/digikam/hi16-action-editimage.png
>>  U   data/icons/digikam/hi22-action-distortionfx.png
>>  U   data/icons/digikam/hi64-action-noisereduction.png
>>  U   data/icons/digikam/hi16-action-contrast.png
>>  U   data/icons/digikam/hi32-action-inpainting.png
>>  U   data/icons/digikam/hi128-action-superimpose.png
>>  U   data/icons/digikam/hi48-action-antivignetting.png
>>  U   data/icons/digikam/hi22-action-adjustlevels.png
>>  U   data/icons/digikam/hi16-action-blurfx.png
>>  U   data/icons/digikam/hi64-action-texture.png
>>  U   data/icons/digikam/hi64-action-shear.png
>>  U   data/icons/digikam/hi22-action-restoration.png
>>  U   data/icons/digikam/hi48-action-freerotation.png
>>  U   data/icons/digikam/hi48-action-shear.png
>>  U   data/icons/digikam/hi32-action-invertimage.png
>>  U   data/icons/digikam/hi48-action-imagecomment.png
>>  U   data/icons/digikam/hi22-action-hotpixels.png
>>  U   data/icons/digikam/hisc-action-antivignetting.svgz
>>  U   data/icons/digikam/hisc-action-distortionfx.svgz
>>  U   data/icons/digikam/hi22-action-adjustrgb.png
>>  U   data/icons/digikam/hi22-action-perspective.png
>>  U   data/icons/digikam/hi64-action-whitebalance.png
>>  U   data/icons/digikam/hi128-action-colormanagement.png
>>  U   data/icons/digikam/hi64-action-contrast.png
>>  U   data/icons/digikam/hisc-action-channelmixer.svgz
>>  U   data/icons/digikam/hi64-action-inpainting.png
>>  U   data/icons/digikam/hi22-action-bwtonal.png
>>  U   data/icons/digikam/hi22-action-exifinfo.png
>>  U   data/icons/digikam/hi48-action-sharpenimage.png
>>  U   data/icons/digikam/hi48-action-channelmixer.png
>>  U   data/icons/digikam/hi22-action-editimage.png
>>  U   data/icons/digikam/hi128-action-shear.png
>>  U   data/icons/digikam/hisc-action-depth8to16.svgz
>>  U   data/icons/digikam/hisc-action-bwtonal.svgz
>>  U   data/icons/digikam/hisc-action-blurimage.svgz
>>  U   data/icons/digikam/hi128-action-exifinfo.png
>>  U   data/icons/digikam/hi48-action-noisereduction.png
>>  U   data/icons/digikam/hi16-action-texture.png
>>  U   data/icons/digikam/hi48-action-distortionfx.png
>>  U   data/icons/digikam/hi64-action-freerotation.png
>>  U   data/icons/digikam/hi32-action-depth8to16.png
>>  U   data/icons/digikam/hi32-action-blurimage.png
>>  U   data/icons/digikam/hi64-action-imagecomment.png
>>  U   data/icons/digikam/hi32-action-superimpose.png
>>  U   data/icons/digikam/hi48-action-adjustlevels.png
>>  U   data/icons/digikam/hisc-action-noisereduction.svgz
>>  U   data/icons/digikam/hi48-action-invertimage.png
>>  U   data/icons/digikam/hi64-action-hotpixels.png
>>  U   data/icons/digikam/hi64-action-adjustrgb.png
>>  U   data/icons/digikam/hisc-action-bordertool.svgz
>>  U   data/icons/digikam/hi32-action-ratiocrop.png
>>  U   data/icons/digikam/hi128-action-adjustcurves.png
>>  U   data/icons/digikam/hi64-action-sharpenimage.png
>>  U   data/icons/digikam/hi16-action-filmgrain.png
>>  U   data/icons/digikam/hi64-action-depth8to16.png
>>  U   data/icons/digikam/hi48-action-exifinfo.png
>>  U   data/icons/digikam/hi64-action-channelmixer.png
>>  U   data/icons/digikam/hi128-action-texture.png
>>  U   data/icons/digikam/hisc-action-freerotation.svgz
>>  U   data/icons/digikam/hi16-action-whitebalance.png
>>  U   data/icons/digikam/hisc-action-depth16to8.svgz
>>  U   data/icons/digikam/hi128-action-blurimage.png
>>  U   data/icons/digikam/hi64-action-editimage.png
>>  U   data/icons/digikam/hi64-action-distortionfx.png
>>  U   data/icons/digikam/hi32-action-depth16to8.png
>>  U   data/icons/digikam/hi48-action-texture.png
>>  U   data/icons/digikam/hi64-action-adjustlevels.png
>>  U   data/icons/digikam/hi16-action-restoration.png
>>  U   data/icons/digikam/hisc-action-adjustrgb.svgz
>>  U   data/icons/digikam/hi48-action-superimpose.png
>>  U   data/icons/digikam/hisc-action-texture.svgz
>>  U   data/icons/digikam/hi128-action-ratiocrop.png
>>  U   data/icons/digikam/hi16-action-perspective.png
>>  U   data/icons/digikam/hi22-action-contrast.png
>>  U   data/icons/digikam/hisc-action-exifinfo.svgz
>>  U   data/icons/digikam/hisc-action-invertimage.svgz
>>  U   data/icons/digikam/hisc-action-colormanagement.svgz
>>  U   data/icons/digikam/hi16-action-freerotation.png
>>  U   data/icons/digikam/hi32-action-bwtonal.png
>>  U   data/icons/digikam/hi16-action-imagecomment.png
>>  U   data/icons/digikam/hi22-action-filmgrain.png
>>  U   data/icons/digikam/hi64-action-depth16to8.png
>>  U   data/icons/digikam/CMakeLists.txt
>>  U   data/icons/digikam/hi64-action-colormanagement.png
>>  U   data/icons/digikam/hi128-action-contrast.png
>>  U   data/icons/digikam/hi32-action-whitebalance.png
>>  U   data/icons/digikam/hisc-action-autocorrection.svgz
>>  U   data/icons/digikam/hisc-action-blurfx.svgz
>>  U   data/icons/digikam/hi128-action-restoration.png
>>  U   data/icons/digikam/hi22-action-shear.png
>>  U   data/icons/digikam/hi128-action-bordertool.png
>>  U   data/icons/digikam/hi16-action-sharpenimage.png
>>  U   data/icons/digikam/hi32-action-exifinfo.png
>> U    data/pics/splash-showfoto.png
>> U    data/pics/splash-digikam.png
>> U    NEWS
>> U    kioslave/digikamtags.protocol
>> U    kioslave/digikamdates.protocol
>> U    kioslave/digikamalbums.protocol
>> U    kioslave/digikamsearch.protocol
>> U    CMakeLists.txt
>> U    themedesigner/CMakeLists.txt
>> U    libs/imageproperties/imagepropertiessidebar.h
>> U    libs/imageproperties/imagepropertiessidebardb.cpp
>> U    libs/imageproperties/imagedescedittab.cpp
>> U    libs/imageproperties/imagepropertiessidebar.cpp
>> D    libs/imageproperties/imagepropertieshistorytab.cpp
>> D    libs/imageproperties/imagepropertieshistorytab.h
>>    C libs/versionmanager
>> U    libs/dimg/dimg_p.h
>> U    libs/dimg/loaders/dimgloader.cpp
>> D    libs/dimg/historyimageid.h
>> D    libs/dimg/dimagehistory.cpp
>> D    libs/dimg/filteraction.h
>> D    libs/dimg/dimagehistory.h
>> D    libs/dimg/historyimageid.cpp
>> D    libs/dimg/filteraction.cpp
>> U    libs/dimg/dimg.cpp
>> U    libs/dimg/dimg.h
>> D    libs/dimg/filters/dimgfiltergenerator.cpp
>> D    libs/dimg/filters/dimgfiltermanager.cpp
>> D    libs/dimg/filters/dimgfiltergenerator.h
>> D    libs/dimg/filters/dimgfiltermanager.h
>> U    libs/dimg/filters/bcg/bcgfilter.cpp
>> U    libs/dimg/filters/bcg/bcgfilter.h
>> U    libs/dimg/filters/icc/iccsettings.cpp
>> U    libs/dimg/filters/icc/iccsettings.h
>> U    libs/dimg/filters/wb/wbfilter.cpp
>> U    libs/dimg/filters/wb/wbfilter.h
>> U    libs/dimg/filters/auto/autolevelsfilter.h
>> U    libs/dimg/filters/auto/autoexpofilter.h
>> U    libs/dimg/filters/auto/stretchfilter.cpp
>> U    libs/dimg/filters/auto/equalizefilter.cpp
>> U    libs/dimg/filters/auto/normalizefilter.cpp
>> U    libs/dimg/filters/auto/stretchfilter.h
>> U    libs/dimg/filters/auto/autolevelsfilter.cpp
>> U    libs/dimg/filters/auto/autoexpofilter.cpp
>> U    libs/dimg/filters/auto/equalizefilter.h
>> U    libs/dimg/filters/auto/normalizefilter.h
>> U    libs/dimg/filters/dimgthreadedfilter.cpp
>> U    libs/dimg/filters/dimgthreadedfilter.h
>>  U   libs/dimg/filters/sharp/refocusfilter.h
>>  U   libs/dimg/filters/sharp/unsharpmaskfilter.cpp
>>  U   libs/dimg/filters/sharp/matrix.cpp
>>  U   libs/dimg/filters/sharp/unsharpmaskfilter.h
>>  U   libs/dimg/filters/sharp/matrix.h
>>  U   libs/dimg/filters/sharp/refocusfilter.cpp
>> U    libs/dimg/CMakeLists.txt
>> U    libs/dialogs/infodlg.cpp
>> U    libs/dialogs/libsinfodlg.cpp
>> U    libs/models/albummodeldragdrophandler.cpp
>> U    libs/models/albummodeldragdrophandler.h
>> U    libs/database/databasefields.h
>> U    libs/database/databaseserverstarter.cpp
>> U    libs/database/databasechangesets.h
>> U    libs/database/albuminfo.h
>> U    libs/database/imageinfolist.cpp
>> U    libs/database/schemaupdater.h
>> U    libs/database/imagescanner.h
>> U    libs/database/databaseserverstarter.h
>> U    libs/database/albumdb.cpp
>> U    libs/database/schemaupdater.cpp
>> U    libs/database/databasecorebackend.h
>> U    libs/database/databasewatch.cpp
>> U    libs/database/imageinfo.cpp
>> U    libs/database/imageinfolist.h
>> U    libs/database/albumdb.h
>> U    libs/database/databasecorebackend.cpp
>> U    libs/database/databaseparameters.cpp
>> U    libs/database/dbactiontype.h
>> U    libs/database/thumbnailschemaupdater.h
>> U    libs/database/imageinfo.h
>> U    libs/database/dbactiontype.cpp
>> U    libs/database/thumbnailschemaupdater.cpp
>> U    libs/database/imagescanner.cpp
>> D    libs/database/tagproperties.cpp
>> D    libs/database/imagetagpair.cpp
>> D    libs/database/tagproperties.h
>> D    libs/database/imagetagpair.h
>> U    libs/dmetadata/dmetadata.cpp
>> U    libs/dmetadata/dmetadata.h
>> U    libs/widgets/common/databasewidget.cpp
>> U    libs/widgets/common/CMakeLists.txt
>> U    libs/widgets/common/databasewidget.h
>> D    libs/widgets/common/imagefiltershistoryitemdelegate.cpp
>> D    libs/widgets/common/imagefiltershistoryview.cpp
>> D    libs/widgets/common/imagefiltershistoryitemdelegate.h
>> D    libs/widgets/common/imagefiltershistorytreeitem.cpp
>> D    libs/widgets/common/imagefiltershistoryview.h
>> D    libs/widgets/common/imagefiltershistorymodel.cpp
>> D    libs/widgets/common/imagehistoryview.cpp
>> D    libs/widgets/common/imagefiltershistorytreeitem.h
>> D    libs/widgets/graphicsview
>> D    libs/widgets/common/imagefiltershistorymodel.h
>> D    libs/widgets/common/imagehistoryview.h
>>  U   libs/3rdparty/clapack
>> U    libs/CMakeLists.txt
>> U    databaseserver/CMakeLists.txt
>> U    README
>> U    digikam/digikamview.cpp
>> U    digikam/leftsidebarwidgets.cpp
>> U    digikam/digikamapp.h
>> U    digikam/albumsettings.h
>> U    digikam/albumwidgetstack.h
>> U    digikam/album.cpp
>> U    digikam/imagepreviewbar.cpp
>> U    digikam/metadatahub.h
>> UU   digikam/digikamapp_p.h
>> U    digikam/digikam.desktop
>>  U   digikam/tooltipfiller.h
>> U    digikam/digikamimageview.cpp
>> U    digikam/metadatahub.cpp
>> U    digikam/albummanager.h
>> U    digikam/componentsinfo.h
>> U    digikam/digikamui.rc
>> U    digikam/albummanager.cpp
>> U    digikam/tagmodificationhelper.cpp
>> U    digikam/daboutdata.h
>> UU   digikam/tooltipfiller.cpp
>> U    digikam/scancontroller.cpp
>> U    digikam/digikamview.h
>> U    digikam/albumsettings.cpp
>> U    digikam/album.h
>> U    digikam/albumtreeview.cpp
>> U    digikam/dio.cpp
>> U    digikam/digikam.notifyrc
>> U    digikam/uifilevalidator.cpp
>> U    digikam/imagecategorydrawer.cpp
>> U    digikam/CMakeLists.txt
>> U    digikam/digikamapp.cpp
>> U    digikam/metadatamanager.cpp
>> U    digikam/tagfiltersidebarwidget.cpp
>> U    digikam/leftsidebarwidgets.h
>> U    digikam/albumdragdrop.cpp
>> U    digikam/albumwidgetstack.cpp
>> D    digikam/albumiconview.h
>> D    digikam/albumicongroupitem.h
>> D    digikam/imagepreviewviewv2.h
>> D    digikam/mapwidgetview.cpp
>> D    digikam/albumiconitem.h
>> D    digikam/albumiconviewtooltip.cpp
>> D    digikam/mapwidgetview.h
>> D    digikam/albumiconview.cpp
>> D    digikam/albumiconviewtooltip.h
>> D    digikam/albumicongroupitem.cpp
>> D    digikam/imagepreviewviewv2.cpp
>> D    digikam/albumiconitem.cpp
>> U    showfoto/showfoto.desktop
>> U    showfoto/showfoto.cpp
>> U    showfoto/CMakeLists.txt
>> U    showfoto/showfoto.h
>> U    utilities/gpssearch/gpssearchview.cpp
>> D    utilities/scriptiface
>> D    utilities/facedetection
>>  U   utilities/lighttable/lighttablewindow_p.h
>>  U   utilities/queuemanager/queuemgrwindow_p.h
>>  U   utilities/queuemanager/basetools/convert/convert2jp2.cpp
>>  U   utilities/queuemanager/basetools/convert/convert2tiff.h
>>  U   utilities/queuemanager/basetools/convert/convert2jp2.h
>>  U   utilities/queuemanager/basetools/convert/convert2png.cpp
>>  U   utilities/queuemanager/basetools/convert/convert2jpeg.cpp
>>  U   utilities/queuemanager/basetools/convert/convert2tiff.cpp
>>  U   utilities/queuemanager/basetools/convert/convert2png.h
>>  U   utilities/queuemanager/basetools/convert/convert2jpeg.h
>>  U   utilities/queuemanager/basetools/enhance/restoration.h
>>  U   utilities/queuemanager/basetools/enhance/restoration.cpp
>>  U   utilities/queuemanager/basetools/decorate/border.h
>>  U   utilities/queuemanager/basetools/decorate/watermark.h
>>  U   utilities/queuemanager/basetools/decorate/border.cpp
>>  U   utilities/queuemanager/basetools/decorate/watermark.cpp
>>  U   utilities/queuemanager/basetools/transform/rotate.cpp
>>  U   utilities/queuemanager/basetools/transform/flip.h
>>  U   utilities/queuemanager/basetools/transform/resize.cpp
>>  U   utilities/queuemanager/basetools/transform/rotate.h
>>  U   utilities/queuemanager/basetools/transform/resize.h
>>  U   utilities/queuemanager/basetools/transform/flip.cpp
>>  U   utilities/queuemanager/basetools/color/autocorrection.cpp
>>  U   utilities/queuemanager/basetools/color/autocorrection.h
>>  U   utilities/queuemanager/queuepool.cpp
>>  U   utilities/queuemanager/queuepool.h
>>  U   utilities/queuemanager/toolslistview.cpp
>>  U   utilities/queuemanager/toolslistview.h
>> U    utilities/batch/batchthumbsgenerator.h
>> D    utilities/batch/batchfacedetector.cpp
>> D    utilities/batch/batchfacedetector.h
>> U    utilities/hotplug/digikam-download.desktop.cmake
>> U    utilities/hotplug/digikam-mount-and-download.desktop.cmake
>> U    utilities/hotplug/digikam-gphoto2-camera.desktop.cmake
>> U    utilities/hotplug/digikam-opencamera.desktop.cmake
>> U    utilities/kipiiface/kipiimagecollection.h
>> U    utilities/kipiiface/kipiimagecollectionselector.h
>> U    utilities/kipiiface/kipiinterface.h
>> U    utilities/kipiiface/kipiuploadwidget.cpp
>> U    utilities/kipiiface/kipiuploadwidget.h
>> U    utilities/kipiiface/kipiimagecollection.cpp
>> U    utilities/kipiiface/kipiimageinfo.cpp
>> U    utilities/kipiiface/kipiimagecollectionselector.cpp
>> U    utilities/kipiiface/kipiinterface.cpp
>>  U   utilities/imageeditor/editor/editorwindow_p.h
>> U    utilities/imageeditor/editor/editortoolsettings.cpp
>> U    utilities/imageeditor/editor/imagewindow.cpp
>> U    utilities/imageeditor/editor/imageiface.cpp
>> U    utilities/imageeditor/editor/editortooliface.cpp
>> U    utilities/imageeditor/editor/digikamimageplugin.desktop
>> U    utilities/imageeditor/editor/editorwindow.cpp
>> U    utilities/imageeditor/editor/imagewindow.h
>> U    utilities/imageeditor/editor/imageiface.h
>> U    utilities/imageeditor/editor/editortooliface.h
>> U    utilities/imageeditor/editor/editorwindow.h
>> U    utilities/imageeditor/editor/editortool.cpp
>> U    utilities/imageeditor/editor/editortool.h
>> U    utilities/imageeditor/canvas/undomanager.cpp
>> U    utilities/imageeditor/canvas/dimginterface.cpp
>> U    utilities/imageeditor/canvas/undoaction.cpp
>> U    utilities/imageeditor/canvas/dimginterface.h
>> U    utilities/imageeditor/canvas/undoaction.h
>> U    utilities/advancedrename/advancedrenamewidget.cpp
>> U    utilities/advancedrename/advancedrenameinput.h
>> U    utilities/advancedrename/advancedrenamewidget.h
>> U    utilities/advancedrename/common/parsesettings.h
>> U    utilities/advancedrename/common/tooltipdialog.cpp
>> U    utilities/advancedrename/common/tooltipcreator.cpp
>> U    utilities/advancedrename/common/tooltipcreator.h
>> U    utilities/advancedrename/parser/options/database/keys/positionkeys.cpp
>> U    utilities/advancedrename/parser/options/database/keys/commonkeys.cpp
>> U    utilities/advancedrename/parser/options/database/keys/metadatakeys.cpp
>> U    utilities/advancedrename/advancedrenamedialog.cpp
>> U    utilities/advancedrename/advancedrenameinput.cpp
>>  U   utilities/cameragui/cameraui_p.h
>> U    utilities/cameragui/cameraiconitem.cpp
>> U    utilities/cameragui/renamecustomizer.cpp
>>  U   utilities/setup/setupcategory.cpp
>> U    utilities/setup/setupmetadata.cpp
>> U    utilities/setup/setup.h
>> U    utilities/setup/setupmisc.cpp
>> U    utilities/setup/setup.cpp
>>  U   utilities/setup/setupcategory.h
>> U    utilities/setup/setupmisc.h
>> U    utilities/setup/setupdatabase.cpp
>> D    utilities/setup/setupscriptmanager.h
>> D    utilities/setup/setupscriptmanager.cpp
>> U    utilities/nepomuk/digikamnepomukservice.cpp
>> U    utilities/nepomuk/digikamnepomukservice.h
>> U    utilities/nepomuk/digikamnepomukservice.desktop
>>  U   .
>> Summary of conflicts:
>>   Tree conflicts: 1
>> [gilles at localhost digikam]$
>>
>> It's not too bad. I'm running it directly in GSoc 2010 branch from my
>> local repository. All Update sound fine. The problem is all Delete
>> actions, which are relevant of new items introduced by GSoC. How I can
>> ignore this ?
>>
>> Best
>>
>> Gilles Caulier
>> _______________________________________________
>> Digikam-devel mailing list
>> Digikam-devel at kde.org
>> https://mail.kde.org/mailman/listinfo/digikam-devel
>
>
>
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel at kde.org
> https://mail.kde.org/mailman/listinfo/digikam-devel
>
>