I think it's OK. Try: git diff 6462a0f 0a6b468
This shows the diff with the last of three of Gordon's "Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop" commits with the previous commit made by Erik with the message "Added missing license headers". It's easier to see in the SourceTree Log view. The diff above is the same as this commit which is really the change that is being made: http://mail-archives.apache.org/mod_mbox/flex-commits/201305.mbox/%3c6cd4ad219d6b40968ea579a30bac4...@git.apache.org%3e This confusion could be avoided by doing a git pull --rebase on the develop branch before pushing new commits to develop. --Dasa On May 7, 2013, at 4:50 PM, Justin Mclean <jus...@classsoftware.com> wrote: > HI, > > Something has gone badly wrong here, not 100% sure but think you may of > merged the wrong way and undid a lot of changes? > > Justin > > > On 08/05/2013, at 8:19 AM, gordonsm...@apache.org wrote: > >> Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk >> into develop >> >> >> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo >> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/94f0c62e >> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/94f0c62e >> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/94f0c62e >> >> Branch: refs/heads/develop >> Commit: 94f0c62e965c9c8f05125436e72f92837b329e40 >> Parents: 13ac9e6 d923193 >> Author: Gordon Smith <gordonsm...@apache.org> >> Authored: Mon Apr 29 21:07:34 2013 -0700 >> Committer: Gordon Smith <gordonsm...@apache.org> >> Committed: Mon Apr 29 21:07:34 2013 -0700 >> >> ---------------------------------------------------------------------- >> .gitignore | 2 +- >> KEYS | 3 +- >> LICENSE | 2 +- >> NOTICE | 2 +- >> README | 33 +- >> RELEASE_NOTES | 24 + >> build.properties | 65 ++ >> build.properties.template | 62 -- >> build.xml | 50 +- >> frameworks/build.xml | 3 - >> frameworks/build_framework.xml | 2 +- >> .../apache/bundles/ja_JP/apache.properties | 2 +- >> .../apache/bundles/nl_NL/apache.properties | 2 +- >> .../apache/bundles/pt_BR/apache.properties | 2 +- >> .../apache/bundles/pt_PT/apache.properties | 2 +- >> .../apache/bundles/ru_RU/apache.properties | 2 +- >> .../projects/experimental/.actionScriptProperties | 19 - >> .../projects/experimental/.flexLibProperties | 10 - >> frameworks/projects/experimental/.gitignore | 1 - >> frameworks/projects/experimental/build.xml | 1 + >> .../framework/src/mx/collections/ArrayList.as | 2 +- >> .../framework/src/mx/collections/AsyncListView.as | 6 +- >> .../framework/src/mx/controls/SWFLoader.as | 9 +- >> .../projects/framework/src/mx/core/DesignLayer.as | 2 +- >> .../projects/framework/src/mx/core/UIComponent.as | 6 +- >> .../projects/framework/src/mx/effects/Pause.as | 2 +- >> .../src/mx/formatters/CurrencyFormatter.as | 9 +- >> .../framework/src/mx/formatters/DateBase.as | 39 +- >> .../framework/src/mx/formatters/DateFormatter.as | 143 +++- >> .../framework/src/mx/managers/PopUpManagerImpl.as | 2 +- >> .../projects/framework/src/mx/states/AddItems.as | 4 +- >> .../framework/src/mx/styles/AdvancedStyleClient.as | 2 +- >> .../projects/framework/src/mx/utils/ArrayUtil.as | 13 +- >> .../projects/framework/src/mx/utils/ObjectUtil.as | 30 +- >> .../projects/framework/src/mx/utils/StringUtil.as | 9 + >> .../framework/src/mx/validators/DateValidator.as | 271 ++++--- >> .../src/spark/components/SplitViewNavigator.as | 2 +- >> .../src/spark/components/TabbedViewNavigator.as | 2 +- >> .../supportClasses/StyleableStageText.as | 2 +- >> .../src/spark/transitions/FlipViewTransition.as | 2 +- >> .../src/spark/transitions/SlideViewTransition.as | 6 +- >> .../src/spark/transitions/ViewTransitionBase.as | 6 +- >> .../projects/mx/src/mx/controls/DateChooser.as | 3 + >> .../projects/mx/src/mx/controls/DateField.as | 253 ++++--- >> frameworks/projects/mx/src/mx/controls/TextArea.as | 2 - >> .../mx/src/mx/controls/listClasses/ListBase.as | 4 + >> .../projects/rpc/src/mx/messaging/Channel.as | 2 +- >> .../rpc/src/mx/rpc/http/HTTPMultiService.as | 4 +- >> .../rpc/src/mx/rpc/http/SerializationFilter.as | 2 +- >> .../projects/rpc/src/mx/rpc/xml/XMLDecoder.as | 2 +- >> .../projects/rpc/src/mx/rpc/xml/XMLEncoder.as | 2 +- >> .../projects/rpc/src/mx/utils/RPCStringUtil.as | 9 + >> .../spark/src/spark/collections/SubListView.as | 4 +- >> .../spark/src/spark/components/ComboBox.as | 2 +- >> .../spark/src/spark/components/DataGrid.as | 202 +++++- >> .../projects/spark/src/spark/components/Form.as | 2 +- >> .../projects/spark/src/spark/components/Grid.as | 286 +++++++- >> .../spark/src/spark/components/RadioButtonGroup.as | 56 ++ >> .../spark/components/gridClasses/GridDimensions.as | 2 +- >> .../components/gridClasses/GridHeaderViewLayout.as | 2 +- >> .../supportClasses/IDataProviderEnhance.as | 161 ++++ >> .../spark/components/supportClasses/ListBase.as | 305 +++++++- >> .../components/supportClasses/RegExPatterns.as | 221 ++++++ >> .../supportClasses/SkinnableComponent.as | 4 +- >> .../spark/components/supportClasses/SliderBase.as | 21 +- >> .../projects/spark/src/spark/effects/Animate.as | 2 +- >> .../src/spark/effects/AnimateTransitionShader.as | 4 +- >> .../spark/src/spark/effects/animation/Animation.as | 2 +- >> .../effects/supportClasses/AnimateInstance.as | 8 +- >> .../supportClasses/AnimateTransformInstance.as | 6 +- >> .../spark/src/spark/filters/ShaderFilter.as | 4 +- >> .../supportClasses/DateTimeFormatterEx.as | 8 +- >> .../globalization/supportClasses/FormatPattern.as | 2 +- >> .../spark/src/spark/layouts/ConstraintLayout.as | 14 +- >> .../spark/TextFieldGridItemRendererInclude.as | 2 +- >> frameworks/projects/textLayout/build.xml | 35 +- >> frameworks/projects/textLayout/compile-config.xml | 6 +- >> frameworks/projects/tool/bundles.properties | 1 + >> .../themes/AeonGraphical/src/AeonGraphical.as | 327 ++++---- >> .../src/DateChooser_nextMonthDisabledSkin.fxg | 92 ++-- >> .../src/DateChooser_nextMonthDownSkin.fxg | 112 ++-- >> .../src/DateChooser_nextMonthOverSkin.fxg | 112 ++-- >> .../src/DateChooser_nextMonthUpSkin.fxg | 112 ++-- >> .../src/DateChooser_nextYearDisabledSkin.fxg | 60 +- >> .../src/DateChooser_nextYearDownSkin.fxg | 37 + >> .../src/DateChooser_nextYearOverSkin.fxg | 60 +- >> .../src/DateChooser_nextYearUpSkin.fxg | 37 + >> .../src/DateChooser_prevMonthDisabledSkin.fxg | 92 ++-- >> .../src/DateChooser_prevMonthDownSkin.fxg | 112 ++-- >> .../src/DateChooser_prevMonthOverSkin.fxg | 112 ++-- >> .../src/DateChooser_prevMonthUpSkin.fxg | 112 ++-- >> .../src/DateChooser_prevYearDisabledSkin.fxg | 37 + >> .../src/DateChooser_prevYearDownSkin.fxg | 60 +- >> .../src/DateChooser_prevYearOverSkin.fxg | 37 + >> .../src/DateChooser_prevYearUpSkin.fxg | 60 +- >> .../src/DateChooser_rollOverIndicatorSkin.fxg | 50 +- >> .../src/DateChooser_selectionIndicatorSkin.fxg | 50 +- >> .../src/DateChooser_todayIndicatorSkin.fxg | 50 +- >> .../AeonGraphical/src/PanelTitleBackground.fxg | 39 + >> .../AeonGraphical/src/PopUpButton_DisabledSkin.fxg | 2 +- >> .../AeonGraphical/src/ScrollBar_thumbIcon.fxg | 30 + >> ide/addAIRtoSDK.sh | 12 + >> ide/flashbuilder/makeApacheFlexForFlashBuilder.bat | 18 +- >> ide/flashbuilder/makeApacheFlexForFlashBuilder.sh | 17 +- >> ide/setFlashPlayerVersion.sh | 27 +- >> jenkins.xml | 2 +- >> local-template.properties | 62 ++ >> modules/asc/src/java/macromedia/abc/Encoder.java | 8 - >> .../flex2/compiler/common/MxmlConfiguration.java | 3 +- >> modules/downloads.xml | 2 +- >> .../java/flash/graphics/g2d/SpriteGraphics2D.java | 3 +- >> modules/thirdparty/batik/build.xml | 23 +- >> .../svggen/font/resources/Messages.properties | 2 +- >> .../resources/XMLResourceDescriptor.properties | 2 +- >> mustella/README | 7 +- >> mustella/as3/src/mustella/ErrorArray.as | 18 + >> .../Properties/DateFormatter_Main_tester.mxml | 5 +- >> .../Formatters_Properties_Currencies.mxml | 100 +++- >> .../tests/Formatters/SWFs/DateFormatter_Main.mxml | 34 +- >> .../tests/LangPacks/Japanese/SWFs/LangPackApp.mxml | 45 +- >> .../JA_CreditCardValidator_FieldRequired.png | Bin 1362 -> 1273 bytes >> .../JA_CreditCardValidator_InvalidCharError.png | Bin 2074 -> 1935 bytes >> .../JA_CreditCardValidator_NumberRequired.png | Bin 2094 -> 1962 bytes >> .../JA_CreditCardValidator_TypeRequired.png | Bin 2639 -> 2527 bytes >> .../JA_CreditCardValidator_invalidNumberError.png | Bin 3243 -> 3061 bytes >> .../JA_CreditCardValidator_wrongLengthError.png | Bin 2222 -> 2081 bytes >> .../JA_CreditCardValidator_wrongTypeError.png | Bin 1975 -> 1865 bytes >> .../JA_CurrencyValidator_currencySymbolError.png | Bin 1660 -> 1562 bytes >> ...JA_CurrencyValidator_decimalPointCountError.png | Bin 1514 -> 1447 bytes >> .../JA_CurrencyValidator_exceedsMaxError.png | Bin 1458 -> 1371 bytes >> .../JA_CurrencyValidator_invalidCharError.png | Bin 1706 -> 1599 bytes >> ...A_CurrencyValidator_invalidFormatCharsError.png | Bin 1645 -> 1556 bytes >> .../JA_CurrencyValidator_lowerThanMinError.png | Bin 1386 -> 1323 bytes >> .../JA_CurrencyValidator_negativeError.png | Bin 1523 -> 1449 bytes >> .../JA_CurrencyValidator_precisionError.png | Bin 1645 -> 1556 bytes >> .../JA_CurrencyValidator_separationError.png | Bin 2006 -> 1997 bytes >> .../baselines/JA_DateChooser_Japanese_Layout.png | Bin 4047 -> 4136 bytes >> .../JA_DateField_Dropdown_Japanese_Layout.png | Bin 3943 -> 4712 bytes >> .../baselines/JA_DateValidator_dateFormat.png | Bin 2270 -> 2167 bytes >> .../baselines/JA_DateValidator_formatError.png | Bin 2302 -> 2127 bytes >> .../JA_DateValidator_invalidCharError.png | Bin 1645 -> 1547 bytes >> .../baselines/JA_DateValidator_wrongDayError.png | Bin 1650 -> 1519 bytes >> .../baselines/JA_DateValidator_wrongMonthError.png | Bin 1660 -> 1497 bytes >> .../baselines/JA_DateValidator_wrongYearError.png | Bin 2372 -> 2181 bytes >> .../JA_EmailValidator_invalidCharError2.png | Bin 2235 -> 2058 bytes >> .../JA_EmailValidator_invalidDomainError.png | Bin 2380 -> 2100 bytes >> .../JA_EmailValidator_invalidDomainError2.png | Bin 2330 -> 2073 bytes >> ..._EmailValidator_invalidDomainError_noPeriod.png | Bin 2220 -> 2012 bytes >> .../JA_EmailValidator_invalidIPDomainError.png | Bin 2606 -> 2212 bytes >> ..._EmailValidator_invalidPeriodsInDomainError.png | Bin 2658 -> 2600 bytes >> .../JA_EmailValidator_missingAtSignError.png | Bin 2234 -> 1939 bytes >> ...A_EmailValidator_missingPeriodInDomainError.png | Bin 2240 -> 2026 bytes >> .../JA_EmailValidator_missingUsernameError.png | Bin 2094 -> 1875 bytes >> .../JA_EmailValidator_tooManyAtSignsError.png | Bin 2510 -> 2297 bytes >> .../JA_NumberValidator_decimalPointCountError.png | Bin 1514 -> 1447 bytes >> .../JA_NumberValidator_exceedsMaxError.png | Bin 1463 -> 1369 bytes >> .../baselines/JA_NumberValidator_integerError.png | Bin 1618 -> 1542 bytes >> .../JA_NumberValidator_invalidCharError.png | Bin 1706 -> 1599 bytes >> ...erValidator_invalidFormatCharsError_Decimal.png | Bin 2238 -> 2174 bytes >> ...rValidator_invalidFormatCharsError_Thousand.png | Bin 2249 -> 2168 bytes >> .../JA_NumberValidator_lowerThanMinError.png | Bin 1386 -> 1323 bytes >> .../baselines/JA_NumberValidator_negativeError.png | Bin 1523 -> 1449 bytes >> .../JA_NumberValidator_precisionError.png | Bin 1645 -> 1556 bytes >> .../JA_PhoneNumberValidator_invalidCharError.png | Bin 1760 -> 1672 bytes >> .../JA_PhoneNumberValidator_wrongLengthError.png | Bin 2201 -> 1771 bytes >> ...JA_SocialSecurityValidator_invalidCharError.png | Bin 1837 -> 1744 bytes >> ...JA_SocialSecurityValidator_wrongFormatError.png | Bin 2994 -> 2840 bytes >> .../JA_SocialSecurityValidator_zeroStartError.png | Bin 2845 -> 2755 bytes >> .../baselines/JA_StringValidator_tooLongError.png | Bin 3260 -> 3018 bytes >> .../baselines/JA_StringValidator_tooLongError1.png | Bin 3242 -> 3021 bytes >> .../baselines/JA_StringValidator_tooShortError.png | Bin 3241 -> 2988 bytes >> .../JA_StringValidator_tooShortError1.png | Bin 3199 -> 2960 bytes >> .../JA_ZipCodeValidator_invalidCharError.png | Bin 1717 -> 1636 bytes >> .../JA_ZipCodeValidator_invalidDomainError.png | Bin 3664 -> 3383 bytes >> .../JA_ZipCodeValidator_wrongCAFormatError.png | Bin 2574 -> 2394 bytes >> .../JA_ZipCodeValidator_wrongLengthError.png | Bin 2272 -> 2151 bytes >> .../JA_ZipCodeValidator_wrongUSFormatError.png | Bin 2455 -> 2239 bytes >> .../Properties/Validators_Date_Properties.mxml | 3 + >> .../Validators_Date_Properties_spark.mxml | 86 ++- >> .../DateField/Methods/DateField_Formats.mxml | 588 +++++++++++++++ >> .../ComboBox/Properties/ComboBox_Properties.mxml | 4 +- >> .../baselines/dropShadowVisible_css_Alert.png | Bin 12180 -> 12182 >> bytes >> .../baselines/dropShadowVisible_default_Alert.png | Bin 16297 -> 16308 >> bytes >> templates/swfobject/index.template.html | 4 +- >> 184 files changed, 3981 insertions(+), 1389 deletions(-) >> ---------------------------------------------------------------------- >> >> > >
