incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: Merging release into develop issue?
Date Wed, 26 Dec 2012 04:42:28 GMT
I only checked the first file, but diff says it is the same, so not sure why
you are getting a conflict.  Are you using the -reintegrate option?  I moved
these from develop to release via merge, so theoretically the merge info
should know about them.

I don't think I would worry too much, if it just baselines, just resolve the
conflict one way or the other.  After merging, we'll run mustella and see if
everything passes and call it a day.


On 12/25/12 6:19 PM, "Justin Mclean" <justin@classsoftware.com> wrote:

> Hi,
> 
> Just doing a dry run of the merge of release into develop and Im getting a
> large number of conflicts with mustella baseline images.
> 
> Anyone have any idea why and if it's an issue? Perhaps they were checked into
> the wrong branch or both branches and the develop branch after the release
> branch??
> 
> For example:
> 
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersid
> es_all.png
>    C 
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_A
> S_EmbeddedArial.png
>    C 
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_m
> xml_EmbeddedVerdana.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersty
> le_inset.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textdecor
> ation_underline.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersty
> le_outset.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersid
> es_lr.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingRi
> ght.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticala
> lign_top.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontsize_
> 16.png
>    C 
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_m
> xml_EmbeddedArial.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticala
> lign_bottom.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_alternati
> ngitemcolors.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalg
> ridlinestrue.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_headercol
> ors.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontstyle
> _italic.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontweigh
> t_bold.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingLe
> ft.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_userollov
> er.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdir
> ection_right.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_dropShado
> wEnabled_true.png
>    C 
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_A
> S_EmbeddedVerdana.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdis
> tance_8.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingTo
> p.png
> C    
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingbo
> ttom.png
>    C 
> mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontfamil
> y_arial.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_group
> edview.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verti
> calscrollpolicy_auto.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_width
> _200.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_forma
> tting_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/use_grouped_da
> ta_mirroring.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_dragg
> ablecolumns_false_state1.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_dragg
> ablecolumns_false_state2.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_width
> _700.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verti
> calscrollpolicy.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_heigh
> t_30.png
> C    mustella/tests/components/AdvancedDataGrid/Properties/Baselines/phone.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_inser
> tcolumn_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_hiera
> rch_data_colgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_enabl
> ed2.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_y_50.
> png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verti
> calscrollposition.png
> C    mustella/tests/components/AdvancedDataGrid/Properties/Baselines/date.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_horiz
> ontalscrollpolicy_off.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_inser
> tcolumngroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_x_min
> us10.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_y_min
> us10.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_colum
> nspanning_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/groupview.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_group
> edview_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/zipcode.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_tree_
> displayitemsexpanded.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_multi
> cellselection.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_custo
> mheaderrenderer_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layou
> tDirection_rtl.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layou
> tDirection_ltr.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verti
> calscrollpolicy_on.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_focus
> enabledfalse.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_tree_
> singlecellselection.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layou
> tDirection_application.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_heade
> rrenderer_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_rowco
> unt_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_x_50.
> png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_tree_
> multicellselection.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_group
> editable_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/columnspan.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_iteme
> ditable_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_width
> _30.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/style1.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/style2.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_horiz
> ontalscrollpolicy_on.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/style3.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_visib
> le_withcolgroups.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_singl
> ecellselection.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layou
> tDirection_application_ltr.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_heigh
> t_200.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/number.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_treev
> iew.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_heigh
> t_120.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_dragg
> ablecolumns_state1.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_focus
> enabledtrue.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/currency.png
> C    
> mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_dragg
> ablecolumns_state2.png
> 
> Thanks,
> Justin

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui


Mime
View raw message