Horrible merge...

Sat Jan 8 14:09:43 CET 2005

Whether I merge autolayers into HEAD or HEAD into autolayers doesn't matter --
it's a pretty horrible merge, as was to be expected... I'm working on finding 
something easier to do, such as a diff between HEAD on 17 december and 
autolayers now and a manual apply. Shouldn't have been so pusilanimous with 
add tags to CVS, I guess.

boud at talnus:~/prj/krita/koffice/krita> cvs up -j autolayers_branch:2004-12-17 
-j autolayers_branch
? doc/93801.pdf
? doc/selection-cvpr2001.pdf
? doc/selection-iccv2001.pdf
A README.autolayers
RCS file: /home/kde/koffice/krita/core/KRayonViewIface.cc,v
retrieving revision 1.10
retrieving revision 1.10.2.1
Merging differences between 1.10 and 1.10.2.1 into KRayonViewIface.cc
RCS file: /home/kde/koffice/krita/core/KRayonViewIface.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
Merging differences between 1.12 and 1.12.2.1 into KRayonViewIface.h
RCS file: /home/kde/koffice/krita/core/Makefile.am,v
retrieving revision 1.114.2.1
retrieving revision 1.114.2.2
Merging differences between 1.114.2.1 and 1.114.2.2 into Makefile.am
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_background.cc,v
retrieving revision 1.8
retrieving revision 1.8.2.3
Merging differences between 1.8 and 1.8.2.3 into kis_background.cc
RCS file: /home/kde/koffice/krita/core/kis_background.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
Merging differences between 1.3 and 1.3.2.1 into kis_background.h
cvs update: file core/kis_clip.cc exists, but has been added in revision 
autolayers_branch
cvs update: file core/kis_clip.h exists, but has been added in revision 
autolayers_branch
RCS file: /home/kde/koffice/krita/core/kis_convolution_painter.cc,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
Merging differences between 1.4.2.1 and 1.4.2.2 into 
kis_convolution_painter.cc
RCS file: /home/kde/koffice/krita/core/kis_doc.cc,v
retrieving revision 1.198.2.1
retrieving revision 1.198.2.6
Merging differences between 1.198.2.1 and 1.198.2.6 into kis_doc.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_doc.h,v
retrieving revision 1.102.2.1
retrieving revision 1.102.2.2
Merging differences between 1.102.2.1 and 1.102.2.2 into kis_doc.h
RCS file: /home/kde/koffice/krita/core/kis_fill_painter.cc,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.6
Merging differences between 1.5.2.1 and 1.5.2.6 into kis_fill_painter.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_fill_painter.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
Merging differences between 1.4.2.1 and 1.4.2.2 into kis_fill_painter.h
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_filter.cc,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
Merging differences between 1.11.2.1 and 1.11.2.2 into kis_filter.cc
RCS file: /home/kde/koffice/krita/core/kis_global.h,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
Merging differences between 1.55.2.1 and 1.55.2.2 into kis_global.h
RCS file: /home/kde/koffice/krita/core/kis_gradient_painter.cc,v
retrieving revision 1.4
retrieving revision 1.4.2.1
Merging differences between 1.4 and 1.4.2.1 into kis_gradient_painter.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_histogram.cc,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
Merging differences between 1.7.2.1 and 1.7.2.2 into kis_histogram.cc
RCS file: /home/kde/koffice/krita/core/kis_image.cc,v
retrieving revision 1.161.2.1
retrieving revision 1.161.2.4
Merging differences between 1.161.2.1 and 1.161.2.4 into kis_image.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_image.h,v
retrieving revision 1.92.2.1
retrieving revision 1.92.2.3
Merging differences between 1.92.2.1 and 1.92.2.3 into kis_image.h
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_iterators.cc,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.3
Merging differences between 1.8.2.1 and 1.8.2.3 into kis_iterators.cc
RCS file: /home/kde/koffice/krita/core/kis_iterators.h,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.3
Merging differences between 1.17.2.1 and 1.17.2.3 into kis_iterators.h
RCS file: /home/kde/koffice/krita/core/kis_iterators_pixel.h,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
Merging differences between 1.6.2.1 and 1.6.2.2 into kis_iterators_pixel.h
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_layer.cc,v
retrieving revision 1.56.2.1
retrieving revision 1.56.2.3
Merging differences between 1.56.2.1 and 1.56.2.3 into kis_layer.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_layer.h,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.3
Merging differences between 1.48.2.1 and 1.48.2.3 into kis_layer.h
RCS file: /home/kde/koffice/krita/core/kis_paint_device.cc,v
retrieving revision 1.104.2.1
retrieving revision 1.104.2.6
Merging differences between 1.104.2.1 and 1.104.2.6 into kis_paint_device.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_paint_device.h,v
retrieving revision 1.82.2.1
retrieving revision 1.82.2.7
Merging differences between 1.82.2.1 and 1.82.2.7 into kis_paint_device.h
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_painter.cc,v
retrieving revision 1.116
retrieving revision 1.116.2.2
Merging differences between 1.116 and 1.116.2.2 into kis_painter.cc
RCS file: /home/kde/koffice/krita/core/kis_painter.h,v
retrieving revision 1.66
retrieving revision 1.66.2.1
Merging differences between 1.66 and 1.66.2.1 into kis_painter.h
RCS file: /home/kde/koffice/krita/core/kis_render.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
Merging differences between 1.9 and 1.9.2.1 into kis_render.h
RCS file: /home/kde/koffice/krita/core/kis_rotate_visitor.cc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
Merging differences between 1.2.2.1 and 1.2.2.2 into kis_rotate_visitor.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_scale_visitor.cc,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.3
Merging differences between 1.8.2.1 and 1.8.2.3 into kis_scale_visitor.cc
RCS file: /home/kde/koffice/krita/core/kis_selection.cc,v
retrieving revision 1.58.2.1
retrieving revision 1.58.2.4
Merging differences between 1.58.2.1 and 1.58.2.4 into kis_selection.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_selection_manager.cc,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.4
Merging differences between 1.15.2.1 and 1.15.2.4 into 
kis_selection_manager.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_tile_command.cc,v
retrieving revision 1.5
retrieving revision 1.5.2.3
Merging differences between 1.5 and 1.5.2.3 into kis_tile_command.cc
RCS file: /home/kde/koffice/krita/core/kis_tile_command.h,v
retrieving revision 1.4
retrieving revision 1.4.2.3
Merging differences between 1.4 and 1.4.2.3 into kis_tile_command.h
RCS file: /home/kde/koffice/krita/core/kis_types.h,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.3
Merging differences between 1.29.2.1 and 1.29.2.3 into kis_types.h
RCS file: /home/kde/koffice/krita/core/kis_view.cc,v
retrieving revision 1.346.2.1
retrieving revision 1.346.2.4
Merging differences between 1.346.2.1 and 1.346.2.4 into kis_view.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/core/kis_view.h,v
retrieving revision 1.170.2.1
retrieving revision 1.170.2.3
Merging differences between 1.170.2.1 and 1.170.2.3 into kis_view.h
RCS file: /home/kde/koffice/krita/core/builder/kis_image_magick_converter.cc,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.3
Merging differences between 1.25.2.1 and 1.25.2.3 into 
kis_image_magick_converter.cc
rcsmerge: warning: conflicts during merge
RCS 
file: /home/kde/koffice/krita/core/color_strategy/kis_colorspace_alpha.cc,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
Merging differences between 1.4.2.1 and 1.4.2.2 into kis_colorspace_alpha.cc
RCS file: /home/kde/koffice/krita/core/paintop/kis_paintop.cc,v
retrieving revision 1.3
retrieving revision 1.3.2.3
Merging differences between 1.3 and 1.3.2.3 into kis_paintop.cc
RCS file: /home/kde/koffice/krita/core/resources/kis_brush.cc,v
retrieving revision 1.1
retrieving revision 1.1.2.2
Merging differences between 1.1 and 1.1.2.2 into kis_brush.cc
RCS file: /home/kde/koffice/krita/core/resources/kis_pattern.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
Merging differences between 1.1.2.1 and 1.1.2.2 into kis_pattern.cc
RCS file: /home/kde/koffice/krita/core/strategy/kis_strategy_move.cc,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
Merging differences between 1.9.2.1 and 1.9.2.2 into kis_strategy_move.cc
RCS file: /home/kde/koffice/krita/core/tiles/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.9.2.4
Merging differences between 1.9 and 1.9.2.4 into Makefile.am
rcsmerge: warning: conflicts during merge
U core/tiles/kis_datamanager.h
U core/tiles/kis_iterator.cc
U core/tiles/kis_iterator.h
U core/tiles/kis_memento.cc
U core/tiles/kis_memento.h
cvs update: scheduling `core/tiles/kis_scoped_lock.cc' for removal
cvs update: scheduling `core/tiles/kis_scoped_lock.h' for removal
U core/tiles/kis_tile.cc
U core/tiles/kis_tile.h
U core/tiles/kis_tileddatamanager.cc
U core/tiles/kis_tileddatamanager.h
U core/tiles/kis_tiledhlineiterator.cc
U core/tiles/kis_tilediterator.h
U core/tiles/kis_tiledvlineiterator.cc
U core/tiles/kis_transaction.h
cvs update: scheduling `core/tiles/kispixeldata.cc' for removal
cvs update: scheduling `core/tiles/kispixeldata.h' for removal
cvs update: scheduling `core/tiles/kistile.cc' for removal
cvs update: scheduling `core/tiles/kistile.h' for removal
cvs update: scheduling `core/tiles/kistilecache.h' for removal
cvs update: scheduling `core/tiles/kistilemediator.cc' for removal
cvs update: scheduling `core/tiles/kistilemediator.h' for removal
cvs update: scheduling `core/tiles/kistilemgr.cc' for removal
cvs update: scheduling `core/tiles/kistilemgr.h' for removal
cvs update: scheduling `core/tiles/kistileswap.h' for removal
RCS file: /home/kde/koffice/krita/core/visitors/kis_flatten.h,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
Merging differences between 1.8.2.1 and 1.8.2.2 into kis_flatten.h
RCS file: /home/kde/koffice/krita/core/visitors/kis_merge.h,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
Merging differences between 1.11.2.1 and 1.11.2.2 into kis_merge.h
cvs update: file doc/profiles.txt exists, but has been added in revision 
autolayers_branch
RCS file: /home/kde/koffice/krita/modules/colorspace_cmyk/cmyk_plugin.cc,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
Merging differences between 1.4.2.1 and 1.4.2.2 into cmyk_plugin.cc
RCS 
file: /home/kde/koffice/krita/modules/colorspace_cmyk/kis_strategy_colorspace_cmyk.cc,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
Merging differences between 1.12.2.1 and 1.12.2.2 into 
kis_strategy_colorspace_cmyk.cc
RCS 
file: /home/kde/koffice/krita/modules/colorspace_cmyk/kis_strategy_colorspace_cmyka.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
Merging differences between 1.1.2.1 and 1.1.2.2 into 
kis_strategy_colorspace_cmyka.cc
RCS file: /home/kde/koffice/krita/modules/colorspace_gray/gray_plugin.cc,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
Merging differences between 1.5.2.1 and 1.5.2.2 into gray_plugin.cc
RCS 
file: /home/kde/koffice/krita/modules/colorspace_gray/kis_strategy_colorspace_grayscale.cc,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
Merging differences between 1.9.2.1 and 1.9.2.2 into 
kis_strategy_colorspace_grayscale.cc
RCS 
file: /home/kde/koffice/krita/modules/colorspace_rgb/kis_strategy_colorspace_rgb.cc,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
Merging differences between 1.13.2.1 and 1.13.2.2 into 
kis_strategy_colorspace_rgb.cc
RCS file: /home/kde/koffice/krita/modules/colorspace_rgb/rgb_plugin.cc,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
Merging differences between 1.4.2.1 and 1.4.2.2 into rgb_plugin.cc
RCS file: /home/kde/koffice/krita/paintops/kis_airbrushop.cc,v
retrieving revision 1.1
retrieving revision 1.1.2.2
Merging differences between 1.1 and 1.1.2.2 into kis_airbrushop.cc
RCS file: /home/kde/koffice/krita/paintops/kis_brushop.cc,v
retrieving revision 1.1
retrieving revision 1.1.2.2
Merging differences between 1.1 and 1.1.2.2 into kis_brushop.cc
RCS file: /home/kde/koffice/krita/paintops/kis_duplicateop.cc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.3
Merging differences between 1.2.2.1 and 1.2.2.3 into kis_duplicateop.cc
RCS file: /home/kde/koffice/krita/paintops/kis_eraseop.cc,v
retrieving revision 1.2
retrieving revision 1.2.2.3
Merging differences between 1.2 and 1.2.2.3 into kis_eraseop.cc
RCS file: /home/kde/koffice/krita/paintops/kis_filterop.cc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
Merging differences between 1.2.2.1 and 1.2.2.2 into kis_filterop.cc
RCS file: /home/kde/koffice/krita/paintops/kis_penop.cc,v
retrieving revision 1.1
retrieving revision 1.1.2.2
Merging differences between 1.1 and 1.1.2.2 into kis_penop.cc
RCS file: /home/kde/koffice/krita/plugins/colorrange/colorrange.cc,v
retrieving revision 1.16
retrieving revision 1.16.2.1
Merging differences between 1.16 and 1.16.2.1 into colorrange.cc
RCS file: /home/kde/koffice/krita/plugins/colorsfilters/colorsfilters.cc,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
Merging differences between 1.22.2.1 and 1.22.2.2 into colorsfilters.cc
RCS 
file: /home/kde/koffice/krita/plugins/colorspaceconversion/colorspaceconversion.cc,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
Merging differences between 1.3.2.1 and 1.3.2.2 into colorspaceconversion.cc
RCS 
file: /home/kde/koffice/krita/plugins/convolutionfilters/convolutionfilters.cc,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
Merging differences between 1.10.2.1 and 1.10.2.2 into convolutionfilters.cc
RCS file: /home/kde/koffice/krita/plugins/example/example.cc,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
Merging differences between 1.21.2.1 and 1.21.2.2 into example.cc
RCS file: /home/kde/koffice/krita/plugins/histogram/histogram.cc,v
retrieving revision 1.7
retrieving revision 1.7.2.1
Merging differences between 1.7 and 1.7.2.1 into histogram.cc
RCS file: /home/kde/koffice/krita/plugins/imagesize/imagesize.cc,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.3
Merging differences between 1.16.2.1 and 1.16.2.3 into imagesize.cc
RCS file: /home/kde/koffice/krita/plugins/kiskjsembed/objects/Makefile.am,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
Merging differences between 1.3.2.1 and 1.3.2.2 into Makefile.am
RCS file: /home/kde/koffice/krita/plugins/performancetest/perftest.cc,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.5
Merging differences between 1.9.2.1 and 1.9.2.5 into perftest.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/plugins/rotateimage/rotateimage.cc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
Merging differences between 1.2 and 1.2.2.1 into rotateimage.cc
RCS file: /home/kde/koffice/krita/plugins/shearimage/shearimage.cc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
Merging differences between 1.2.2.1 and 1.2.2.2 into shearimage.cc
RCS file: /home/kde/koffice/krita/plugins/tool_crop/kis_tool_crop.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.4
Merging differences between 1.1.2.1 and 1.1.2.4 into kis_tool_crop.cc
RCS file: /home/kde/koffice/krita/plugins/variations/variations.cc,v
retrieving revision 1.8
retrieving revision 1.8.2.1
Merging differences between 1.8 and 1.8.2.1 into variations.cc
RCS file: /home/kde/koffice/krita/tools/kis_tool_colorpicker.cc,v
retrieving revision 1.45
retrieving revision 1.45.2.1
Merging differences between 1.45 and 1.45.2.1 into kis_tool_colorpicker.cc
RCS file: /home/kde/koffice/krita/tools/kis_tool_fill.cc,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.3
Merging differences between 1.49.2.1 and 1.49.2.3 into kis_tool_fill.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/tools/kis_tool_freehand.cc,v
retrieving revision 1.14
retrieving revision 1.14.2.3
Merging differences between 1.14 and 1.14.2.3 into kis_tool_freehand.cc
RCS file: /home/kde/koffice/krita/tools/kis_tool_move.cc,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
Merging differences between 1.45.2.1 and 1.45.2.2 into kis_tool_move.cc
RCS file: /home/kde/koffice/krita/tools/kis_tool_text.cc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
Merging differences between 1.3 and 1.3.2.1 into kis_tool_text.cc
RCS file: /home/kde/koffice/krita/ui/kis_dlg_create_img.cc,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
Merging differences between 1.11.2.1 and 1.11.2.2 into kis_dlg_create_img.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/ui/kis_dlg_image_properties.cc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
Merging differences between 1.2.2.1 and 1.2.2.2 into 
kis_dlg_image_properties.cc
ui/kis_dlg_image_properties.cc already contains the differences between 
1.2.2.1 and 1.2.2.2
RCS file: /home/kde/koffice/krita/ui/kis_dlg_new_layer.cc,v
retrieving revision 1.16
retrieving revision 1.16.2.1
Merging differences between 1.16 and 1.16.2.1 into kis_dlg_new_layer.cc
RCS file: /home/kde/koffice/krita/ui/kis_dlg_new_layer.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
Merging differences between 1.8 and 1.8.2.1 into kis_dlg_new_layer.h
RCS file: /home/kde/koffice/krita/ui/kis_previewwidget.cc,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.4
Merging differences between 1.13.2.1 and 1.13.2.4 into kis_previewwidget.cc
rcsmerge: warning: conflicts during merge
RCS file: /home/kde/koffice/krita/ui/widgets/kis_gradient_slider_widget.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
Merging differences between 1.1.2.1 and 1.1.2.2 into 
kis_gradient_slider_widget.cc
rcsmerge: warning: conflicts during merge

-- 
Boudewijn Rempt 
http://www.valdyas.org/fading/index.cgi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kimageshop/attachments/20050108/0e89df5d/attachment.pgp