You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Justin Mclean <ju...@classsoftware.com> on 2012/12/26 03:19:05 UTC
Merging release into develop issue?
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_bordersides_all.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedVerdana.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_inset.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textdecoration_underline.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_outset.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_lr.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingRight.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_top.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontsize_16.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_bottom.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_alternatingitemcolors.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalgridlinestrue.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_headercolors.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontstyle_italic.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontweight_bold.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingLeft.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_userollover.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdirection_right.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_dropShadowEnabled_true.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedVerdana.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdistance_8.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingTop.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingbottom.png
C mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontfamily_arial.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_groupedview.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verticalscrollpolicy_auto.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_width_200.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_formatting_withcolgroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/use_grouped_data_mirroring.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_draggablecolumns_false_state1.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_draggablecolumns_false_state2.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_width_700.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verticalscrollpolicy.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_height_30.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/phone.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_insertcolumn_withcolgroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_hierarch_data_colgroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_enabled2.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_y_50.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verticalscrollposition.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/date.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_horizontalscrollpolicy_off.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_insertcolumngroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_x_minus10.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_y_minus10.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_columnspanning_withcolgroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/groupview.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_groupedview_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_multicellselection.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_customheaderrenderer_withcolgroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layoutDirection_rtl.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layoutDirection_ltr.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_verticalscrollpolicy_on.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_focusenabledfalse.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_tree_singlecellselection.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layoutDirection_application.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_headerrenderer_withcolgroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_rowcount_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_groupeditable_withcolgroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/columnspan.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_itemeditable_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_horizontalscrollpolicy_on.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/style3.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_visible_withcolgroups.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_singlecellselection.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/property_layoutDirection_application_ltr.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_height_200.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/number.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_treeview.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_height_120.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_draggablecolumns_state1.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_focusenabledtrue.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/currency.png
C mustella/tests/components/AdvancedDataGrid/Properties/Baselines/datagrid_draggablecolumns_state2.png
Thanks,
Justin
Re: Merging release into develop issue?
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> 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?
No I'm not, as far as I'm aware:
1. --reintegrate is not required in SVN 1.6+
2. We don't want to use --reintegrate as the release branch still needs to be a working branch as it possible that fixes may need to be applied to it. If you do use --reintegrate I think you would then have to delete the release branch and then recreate it with the same name. I'd rather avoid that if I can.
> I don't think I would worry too much, if it just baselines, just resolve the
> conflict one way or the other.
OK
Thanks,
Justin
Re: Merging release into develop issue?
Posted by Alex Harui <ah...@adobe.com>.
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" <ju...@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