- Pharo-dev - lists.pharo.org

[pharo-project/pharo-core]

by GitHub

Branch: refs/tags/60035 Home: https://github.com/pharo-project/pharo-core

May 25, 2016

[pharo-project/pharo-core] 4009b9: 60035

by GitHub

Branch: refs/heads/6.0 Home: https://github.com/pharo-project/pharo-core Commit: 4009b93243a17cdc8742ae40835544e4a93d1edb https://github.com/pharo-project/pharo-core/commit/4009b93243a17cdc8742ae40… Author: Jenkins Build Server <board(a)pharo-project.org> Date: 2016-05-25 (Wed, 25 May 2016) Changed paths: R Morphic-Widgets-List.package/SimpleHierarchicalListMorph.class/instance/updating/themeChanged.st A Polymorph-Widgets.package/extension/DockingBarMorph/instance/themeChanged.st A Polymorph-Widgets.package/extension/GroupWindowMorph/instance/themeChanged.st A Polymorph-Widgets.package/extension/SimpleHierarchicalListMorph/instance/themeChanged.st R ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60034.st A ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60035.st R ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60034.st A ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60035.st M ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st A Spec-Core.package/AbstractWidgetModel.class/instance/api/enabledHolder.st M Spec-Core.package/ButtonModel.class/instance/initialization/initialize.st M Spec-Core.package/CheckBoxModel.class/instance/initialization/initialize.st M Spec-Core.package/LabelModel.class/instance/initialization/initialize.st R Spec-Core.package/RadioButtonModel.class/instance/accessing/enabledHolder.st M Spec-Core.package/RadioButtonModel.class/instance/initialization/initialize.st M Spec-Core.package/TextModel.class/instance/initialization/initialize.st M Spec-Core.package/TextModel.class/instance/initialization/registerEvents.st M Spec-Tests.package/ButtonModelTest.class/definition.st R Spec-Tests.package/ButtonModelTest.class/instance/as yet unclassified/testAskBeforeChanging.st A Spec-Tests.package/ButtonModelTest.class/instance/running/morph.st A Spec-Tests.package/ButtonModelTest.class/instance/running/setUp.st A Spec-Tests.package/ButtonModelTest.class/instance/tests/testAskBeforeChanging.st A Spec-Tests.package/ButtonModelTest.class/instance/tests/testEnabled.st M Text-Edition.package/Editor.class/class/settings/editingSettingsOn_.st Log Message: ----------- 60035 18175 Cleaned up code duplication in initialization https://pharo.fogbugz.com/f/cases/18175 18241 Settings: Text editor settings group name https://pharo.fogbugz.com/f/cases/18241 18321 GroupWindowMorph lack #themeChanged https://pharo.fogbugz.com/f/cases/18321 18320 DockingBarMorph lack #themeChanged https://pharo.fogbugz.com/f/cases/18320 18319 SimpleHierarchicalListMorph need a better #themeChanged method https://pharo.fogbugz.com/f/cases/18319 http://files.pharo.org/image/60/60035.zip

May 25, 2016

Re: [Pharo-dev] about ensureCreateFile

by Peter UhnÃ¡k

We were discussing it when I was in Lille. >From my side the conclusion wasâ¦ do whatever you want with it, as long as there is a (new) method that raises an error when the parent does not exist. On Wed, May 25, 2016 at 8:40 AM, stepharo <stepharo(a)free.fr> wrote: > I would like to move on on this one: > > https://pharo.fogbugz.com/f/cases/18084/FileReference-EnsureCreateFile > > I'm in favor of the change. But I'm all ears. > > > Stef > > >

May 25, 2016

Re: [Pharo-dev] [pharo-project/pharo-core] edfbef: 60034

by Pavel Krivanek

I did it already. 2016-05-25 10:26 GMT+02:00 stepharo <stepharo(a)free.fr>: > because I was in the process of integrating it. Now I will close it. > > Le 25/5/16 Ã 09:10, Pavel Krivanek a Ã©crit : > > 18302 icons -> icons iconNamed: (part 1) > <https://pharo.fogbugz.com/f/cases/18302> > https://pharo.fogbugz.com/f/cases/18302 > > This issue is not closed. Why? > > -- Pavel > > > > 2016-05-25 8:57 GMT+02:00 GitHub <noreply(a)github.com>: > >> Branch: refs/heads/6.0 >> Home: https://github.com/pharo-project/pharo-core >> Commit: edfbeff952d0fc42d444b7c2420c086beb68effa >> >> https://github.com/pharo-project/pharo-core/commit/edfbeff952d0fc42d444b7c2… >> Author: Jenkins Build Server <board(a)pharo-project.org> >> Date: 2016-05-25 (Wed, 25 May 2016) >> >> Changed paths: >> M >> FreeType.package/FreeTypeSystemSettings.class/class/settings/freeTypeSettingsOn_.st >> M >> Glamour-Rubric-Presentations.package/GLMLipsumWithSegmentsExample.class/instance/accessing/ >> presentation.st >> M HelpSystem-Core.package/HelpBrowser.class/class/world >> menu/menuCommandOn_.st >> M MenuRegistration.package/MenuRegistrationExample.class/class/menu >> declaring/mostUsedToolsOn_.st >> M MenuRegistration.package/MenuRegistrationExample.class/class/menu >> declaring/toolsOn_.st >> M >> Morphic-Base.package/ShortcutReminder.class/class/settings/settingsOn_.st >> M >> NECompletion.package/NECPreferences.class/class/settings/settingsOn_.st >> M Nautilus.package/AbstractNautilusUI.class/instance/build ui >> buttons/buildNavigationNextButton.st >> M Nautilus.package/AbstractNautilusUI.class/instance/build ui >> buttons/buildNavigationPreviousButton.st >> M Nautilus.package/AbstractNautilusUI.class/instance/buttons >> behavior/browseVariableReferences.st >> M Nautilus.package/AbstractNautilusUI.class/instance/buttons >> behavior/commentButtonIcon.st >> M Nautilus.package/AbstractNautilusUI.class/instance/buttons >> behavior/hierarchyButtonIcon.st >> M Nautilus.package/AbstractNautilusUI.class/instance/buttons >> behavior/instanceButtonIcon.st >> M >> Nautilus.package/AbstractNautilusUI.class/instance/icon/classIconFor_.st >> M >> Nautilus.package/AbstractNautilusUI.class/instance/icon/groupIconFor_.st >> M >> Nautilus.package/AbstractNautilusUI.class/instance/icon/packageIconFor_.st >> M Nautilus.package/AbstractNautilusUI.class/instance/system >> announcements/testCaseStarted_.st >> M ProfStef-Core.package/ProfStef.class/class/zen/menuCommandOn_.st >> M >> Reflectivity-Examples.package/MetalinkIconStyler.class/instance/defaults/iconFor_.st >> M >> Reflectivity-Tools.package/BreakpointIconStyler.class/instance/defaults/iconFor_.st >> M Rubric.package/RubLineNumberDisplayer.class/class/menu >> declaration/menuOn_.st >> M Rubric.package/RubLipsumWithSegmentsExample.class/instance/user >> interface/newScrolledText.st >> M Rubric.package/RubPlainTextMode.class/class/menu/menuOn_.st >> M Rubric.package/RubSmalltalkCodeMode.class/class/menu/menuOn_.st >> M Rubric.package/RubSmalltalkEditor.class/class/accessing/menuOn_.st >> M >> ScriptLoader60.package/ScriptLoader.class/class/menu/menuCommandOn_.st >> R ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/ >> script60033.st >> A ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/ >> script60034.st >> R ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/ >> update60033.st >> A ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/ >> update60034.st >> M >> ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st >> M Shout.package/SHPreferences.class/class/settings/settingsOn_.st >> A Spec-Core.package/ComposableModel.class/instance/icon/iconNamed_.st >> A Spec-Core.package/ComposableModel.class/instance/icon/icon_.st >> M >> Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/addItem.st >> M >> Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/addItemTo_.st >> M >> Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/initializeWidgets.st >> M >> Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/subMenu.st >> A >> Spec-Inspector.package/AbstractEyeElement.class/instance/icon/iconNamed_.st >> M >> Spec-Inspector.package/AbstractEyeElement.class/instance/menu/errorSubMenu_.st >> R >> Spec-Inspector.package/SelfEyeElement.class/instance/action/browseInstClassVariable.st >> A >> Spec-Inspector.package/SelfEyeElement.class/instance/action/browseInstClassVariables.st >> A System-Model.package/Model.class/class/utils-icons/iconNamed_.st >> A System-Model.package/Model.class/instance/icon/iconNamed_.st >> M System-Settings.package/SettingBrowser.class/class/world >> menu/menuCommandOn_.st >> A Tool-Base.package/AbstractTool.class/instance/icon/iconNamed_.st >> A Tool-Base.package/AbstractTool.class/instance/icon/icon_.st >> M >> Tool-Catalog.package/CatalogBrowser.class/instance/menu/defineAllRepositoriesInMCBrowserButton_.st >> M >> Tool-Catalog.package/CatalogBrowser.class/instance/menu/defineCurrentVersionRepositoryButton_.st >> M >> Tool-Catalog.package/CatalogBrowser.class/instance/menu/installStableVersionButton_.st >> M >> Tool-Catalog.package/CatalogBrowser.class/instance/menu/installStableVersionMenuItem_.st >> M Tool-FileList.package/FileList.class/class/menu/contentMenu_.st >> A Tool-FileList.package/FileList.class/class/menu/iconNamed_.st >> >> Log Message: >> ----------- >> 60034 >> 18302 icons -> icons iconNamed: (part 1) >> https://pharo.fogbugz.com/f/cases/18302 >> >> http://files.pharo.org/image/60/60034.zip >> >> >> > >

May 25, 2016

Re: [Pharo-dev] [pharo-project/pharo-core] edfbef: 60034

by stepharo

because I was in the process of integrating it. Now I will close it. Le 25/5/16 Ã 09:10, Pavel Krivanek a Ã©crit : > 18302 icons -> icons iconNamed: (part 1) > https://pharo.fogbugz.com/f/cases/18302 > > This issue is not closed. Why? > > -- Pavel > > > > 2016-05-25 8:57 GMT+02:00 GitHub <noreply(a)github.com > <mailto:noreply@github.com>>: > > Branch: refs/heads/6.0 > Home: https://github.com/pharo-project/pharo-core > Commit: edfbeff952d0fc42d444b7c2420c086beb68effa > https://github.com/pharo-project/pharo-core/commit/edfbeff952d0fc42d444b7c2… > Author: Jenkins Build Server <board(a)pharo-project.org > <mailto:board@pharo-project.org>> > Date: 2016-05-25 (Wed, 25 May 2016) > > Changed paths: > M > FreeType.package/FreeTypeSystemSettings.class/class/settings/freeTypeSettingsOn_.st > M > Glamour-Rubric-Presentations.package/GLMLipsumWithSegmentsExample.class/instance/accessing/presentation.st > <http://presentation.st> > M HelpSystem-Core.package/HelpBrowser.class/class/world > menu/menuCommandOn_.st > M > MenuRegistration.package/MenuRegistrationExample.class/class/menu > declaring/mostUsedToolsOn_.st > M > MenuRegistration.package/MenuRegistrationExample.class/class/menu > declaring/toolsOn_.st > M > Morphic-Base.package/ShortcutReminder.class/class/settings/settingsOn_.st > M > NECompletion.package/NECPreferences.class/class/settings/settingsOn_.st > M Nautilus.package/AbstractNautilusUI.class/instance/build ui > buttons/buildNavigationNextButton.st > M Nautilus.package/AbstractNautilusUI.class/instance/build ui > buttons/buildNavigationPreviousButton.st > M Nautilus.package/AbstractNautilusUI.class/instance/buttons > behavior/browseVariableReferences.st > M Nautilus.package/AbstractNautilusUI.class/instance/buttons > behavior/commentButtonIcon.st > M Nautilus.package/AbstractNautilusUI.class/instance/buttons > behavior/hierarchyButtonIcon.st > M Nautilus.package/AbstractNautilusUI.class/instance/buttons > behavior/instanceButtonIcon.st > M > Nautilus.package/AbstractNautilusUI.class/instance/icon/classIconFor_.st > M > Nautilus.package/AbstractNautilusUI.class/instance/icon/groupIconFor_.st > M > Nautilus.package/AbstractNautilusUI.class/instance/icon/packageIconFor_.st > M Nautilus.package/AbstractNautilusUI.class/instance/system > announcements/testCaseStarted_.st > M ProfStef-Core.package/ProfStef.class/class/zen/menuCommandOn_.st > M > Reflectivity-Examples.package/MetalinkIconStyler.class/instance/defaults/iconFor_.st > M > Reflectivity-Tools.package/BreakpointIconStyler.class/instance/defaults/iconFor_.st > M Rubric.package/RubLineNumberDisplayer.class/class/menu > declaration/menuOn_.st > M > Rubric.package/RubLipsumWithSegmentsExample.class/instance/user > interface/newScrolledText.st > M Rubric.package/RubPlainTextMode.class/class/menu/menuOn_.st > M Rubric.package/RubSmalltalkCodeMode.class/class/menu/menuOn_.st > M > Rubric.package/RubSmalltalkEditor.class/class/accessing/menuOn_.st > M > ScriptLoader60.package/ScriptLoader.class/class/menu/menuCommandOn_.st > R ScriptLoader60.package/ScriptLoader.class/instance/pharo - > scripts/script60033.st <http://script60033.st> > A ScriptLoader60.package/ScriptLoader.class/instance/pharo - > scripts/script60034.st <http://script60034.st> > R ScriptLoader60.package/ScriptLoader.class/instance/pharo - > updates/update60033.st <http://update60033.st> > A ScriptLoader60.package/ScriptLoader.class/instance/pharo - > updates/update60034.st <http://update60034.st> > M > ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st > M Shout.package/SHPreferences.class/class/settings/settingsOn_.st > A > Spec-Core.package/ComposableModel.class/instance/icon/iconNamed_.st > A Spec-Core.package/ComposableModel.class/instance/icon/icon_.st > M > Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/addItem.st > M > Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/addItemTo_.st > M > Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/initializeWidgets.st > M > Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/subMenu.st > A > Spec-Inspector.package/AbstractEyeElement.class/instance/icon/iconNamed_.st > M > Spec-Inspector.package/AbstractEyeElement.class/instance/menu/errorSubMenu_.st > R > Spec-Inspector.package/SelfEyeElement.class/instance/action/browseInstClassVariable.st > A > Spec-Inspector.package/SelfEyeElement.class/instance/action/browseInstClassVariables.st > A System-Model.package/Model.class/class/utils-icons/iconNamed_.st > A System-Model.package/Model.class/instance/icon/iconNamed_.st > M System-Settings.package/SettingBrowser.class/class/world > menu/menuCommandOn_.st > A Tool-Base.package/AbstractTool.class/instance/icon/iconNamed_.st > A Tool-Base.package/AbstractTool.class/instance/icon/icon_.st > M > Tool-Catalog.package/CatalogBrowser.class/instance/menu/defineAllRepositoriesInMCBrowserButton_.st > M > Tool-Catalog.package/CatalogBrowser.class/instance/menu/defineCurrentVersionRepositoryButton_.st > M > Tool-Catalog.package/CatalogBrowser.class/instance/menu/installStableVersionButton_.st > M > Tool-Catalog.package/CatalogBrowser.class/instance/menu/installStableVersionMenuItem_.st > M Tool-FileList.package/FileList.class/class/menu/contentMenu_.st > A Tool-FileList.package/FileList.class/class/menu/iconNamed_.st > > Log Message: > ----------- > 60034 > 18302 icons -> icons iconNamed: (part 1) > https://pharo.fogbugz.com/f/cases/18302 > > http://files.pharo.org/image/60/60034.zip > > >

May 25, 2016

Re: [Pharo-dev] [pharo-project/pharo-core] edfbef: 60034

by Pavel Krivanek

18302 icons -> icons iconNamed: (part 1) https://pharo.fogbugz.com/f/cases/18302 This issue is not closed. Why? -- Pavel 2016-05-25 8:57 GMT+02:00 GitHub <noreply(a)github.com>: > Branch: refs/heads/6.0 > Home: https://github.com/pharo-project/pharo-core > Commit: edfbeff952d0fc42d444b7c2420c086beb68effa > > https://github.com/pharo-project/pharo-core/commit/edfbeff952d0fc42d444b7c2… > Author: Jenkins Build Server <board(a)pharo-project.org> > Date: 2016-05-25 (Wed, 25 May 2016) > > Changed paths: > M > FreeType.package/FreeTypeSystemSettings.class/class/settings/freeTypeSettingsOn_.st > M > Glamour-Rubric-Presentations.package/GLMLipsumWithSegmentsExample.class/instance/accessing/ > presentation.st > M HelpSystem-Core.package/HelpBrowser.class/class/world > menu/menuCommandOn_.st > M MenuRegistration.package/MenuRegistrationExample.class/class/menu > declaring/mostUsedToolsOn_.st > M MenuRegistration.package/MenuRegistrationExample.class/class/menu > declaring/toolsOn_.st > M > Morphic-Base.package/ShortcutReminder.class/class/settings/settingsOn_.st > M > NECompletion.package/NECPreferences.class/class/settings/settingsOn_.st > M Nautilus.package/AbstractNautilusUI.class/instance/build ui > buttons/buildNavigationNextButton.st > M Nautilus.package/AbstractNautilusUI.class/instance/build ui > buttons/buildNavigationPreviousButton.st > M Nautilus.package/AbstractNautilusUI.class/instance/buttons > behavior/browseVariableReferences.st > M Nautilus.package/AbstractNautilusUI.class/instance/buttons > behavior/commentButtonIcon.st > M Nautilus.package/AbstractNautilusUI.class/instance/buttons > behavior/hierarchyButtonIcon.st > M Nautilus.package/AbstractNautilusUI.class/instance/buttons > behavior/instanceButtonIcon.st > M > Nautilus.package/AbstractNautilusUI.class/instance/icon/classIconFor_.st > M > Nautilus.package/AbstractNautilusUI.class/instance/icon/groupIconFor_.st > M > Nautilus.package/AbstractNautilusUI.class/instance/icon/packageIconFor_.st > M Nautilus.package/AbstractNautilusUI.class/instance/system > announcements/testCaseStarted_.st > M ProfStef-Core.package/ProfStef.class/class/zen/menuCommandOn_.st > M > Reflectivity-Examples.package/MetalinkIconStyler.class/instance/defaults/iconFor_.st > M > Reflectivity-Tools.package/BreakpointIconStyler.class/instance/defaults/iconFor_.st > M Rubric.package/RubLineNumberDisplayer.class/class/menu > declaration/menuOn_.st > M Rubric.package/RubLipsumWithSegmentsExample.class/instance/user > interface/newScrolledText.st > M Rubric.package/RubPlainTextMode.class/class/menu/menuOn_.st > M Rubric.package/RubSmalltalkCodeMode.class/class/menu/menuOn_.st > M Rubric.package/RubSmalltalkEditor.class/class/accessing/menuOn_.st > M > ScriptLoader60.package/ScriptLoader.class/class/menu/menuCommandOn_.st > R ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/ > script60033.st > A ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/ > script60034.st > R ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/ > update60033.st > A ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/ > update60034.st > M > ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st > M Shout.package/SHPreferences.class/class/settings/settingsOn_.st > A Spec-Core.package/ComposableModel.class/instance/icon/iconNamed_.st > A Spec-Core.package/ComposableModel.class/instance/icon/icon_.st > M > Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/addItem.st > M > Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/addItemTo_.st > M > Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/initializeWidgets.st > M > Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/subMenu.st > A > Spec-Inspector.package/AbstractEyeElement.class/instance/icon/iconNamed_.st > M > Spec-Inspector.package/AbstractEyeElement.class/instance/menu/errorSubMenu_.st > R > Spec-Inspector.package/SelfEyeElement.class/instance/action/browseInstClassVariable.st > A > Spec-Inspector.package/SelfEyeElement.class/instance/action/browseInstClassVariables.st > A System-Model.package/Model.class/class/utils-icons/iconNamed_.st > A System-Model.package/Model.class/instance/icon/iconNamed_.st > M System-Settings.package/SettingBrowser.class/class/world > menu/menuCommandOn_.st > A Tool-Base.package/AbstractTool.class/instance/icon/iconNamed_.st > A Tool-Base.package/AbstractTool.class/instance/icon/icon_.st > M > Tool-Catalog.package/CatalogBrowser.class/instance/menu/defineAllRepositoriesInMCBrowserButton_.st > M > Tool-Catalog.package/CatalogBrowser.class/instance/menu/defineCurrentVersionRepositoryButton_.st > M > Tool-Catalog.package/CatalogBrowser.class/instance/menu/installStableVersionButton_.st > M > Tool-Catalog.package/CatalogBrowser.class/instance/menu/installStableVersionMenuItem_.st > M Tool-FileList.package/FileList.class/class/menu/contentMenu_.st > A Tool-FileList.package/FileList.class/class/menu/iconNamed_.st > > Log Message: > ----------- > 60034 > 18302 icons -> icons iconNamed: (part 1) > https://pharo.fogbugz.com/f/cases/18302 > > http://files.pharo.org/image/60/60034.zip > > >

May 25, 2016

Re: [Pharo-dev] slice/merge conflict with package AST-FFI-Pharo50Compatibility

by Nicolai Hess

2016-05-25 8:47 GMT+02:00 stepharo <stepharo(a)free.fr>: > hi nicolai > > > let me know when this is ready to integrate. > > We are trying to purge the queue but sometimes I end up redoing the > changes in fast mode. > Thanks, fix for 17696 should work now (monkey is checking). > > Stef > > Le 25/5/16 Ã 00:06, Nicolai Hess a Ã©crit : > > > > 2016-05-24 23:51 GMT+02:00 Henrik Nergaard <henrik.nergaard(a)uia.no>: > >> When trying to load the Slice for 17696 from pharo60Inbox I get: >> âMessageNotUnderstood: receiver of "dependencies" is nilâ when it tries to >> load AST-FFI-Pharo50Compatibility. >> >> >> >> I think you need to reset the package cache/folder? >> >> You might also I need to do the slice again (without loading the >> previous), and ensure that the author set when uploading the slice is not >> the same as similar slices in the repo so it will not create dependencies >> of it ( ie before creating the slice do: âAuthor fullname: â_NicolaiHessâ >> > > Thanks, I think cleaning the package cache folder did the trick. It seems > to work now. > > >> >> >> Best regards, >> >> Henrik >> >> >> >> *From:* Pharo-dev [mailto:pharo-dev-bounces@lists.pharo.org] *On Behalf >> Of *Nicolai Hess >> *Sent:* Tuesday, May 24, 2016 11:38 PM >> *To:* Pharo Development List < <pharo-dev(a)lists.pharo.org> >> pharo-dev(a)lists.pharo.org> >> *Subject:* [Pharo-dev] slice/merge conflict with package >> AST-FFI-Pharo50Compatibility >> >> >> >> I need help with issues >> 17696 >> <https://pharo.fogbugz.com/f/cases/17696/RBParser-should-not-allow-variable-…> >> RBParser should not allow variable names for pragma arguments >> 17994 >> <https://pharo.fogbugz.com/f/cases/17994/RBParserNode-allowed-primitive-prag…> >> RBParserNode: allowed primitive pragma definition can not compile >> >> for both issues I created a slice that will modify methods from package >> AST-FFI-Pharo50Compatibility, but merging this slices shows a merge >> conflict. >> >> I don't know what is wrong or how I could solve this. >> >> any help appreciated. >> >> nicolai >> > > >

May 25, 2016

[pharo-project/pharo-core]

by GitHub

Branch: refs/tags/60034 Home: https://github.com/pharo-project/pharo-core

May 25, 2016

[pharo-project/pharo-core] edfbef: 60034

by GitHub

Branch: refs/heads/6.0 Home: https://github.com/pharo-project/pharo-core Commit: edfbeff952d0fc42d444b7c2420c086beb68effa https://github.com/pharo-project/pharo-core/commit/edfbeff952d0fc42d444b7c2… Author: Jenkins Build Server <board(a)pharo-project.org> Date: 2016-05-25 (Wed, 25 May 2016) Changed paths: M FreeType.package/FreeTypeSystemSettings.class/class/settings/freeTypeSettingsOn_.st M Glamour-Rubric-Presentations.package/GLMLipsumWithSegmentsExample.class/instance/accessing/presentation.st M HelpSystem-Core.package/HelpBrowser.class/class/world menu/menuCommandOn_.st M MenuRegistration.package/MenuRegistrationExample.class/class/menu declaring/mostUsedToolsOn_.st M MenuRegistration.package/MenuRegistrationExample.class/class/menu declaring/toolsOn_.st M Morphic-Base.package/ShortcutReminder.class/class/settings/settingsOn_.st M NECompletion.package/NECPreferences.class/class/settings/settingsOn_.st M Nautilus.package/AbstractNautilusUI.class/instance/build ui buttons/buildNavigationNextButton.st M Nautilus.package/AbstractNautilusUI.class/instance/build ui buttons/buildNavigationPreviousButton.st M Nautilus.package/AbstractNautilusUI.class/instance/buttons behavior/browseVariableReferences.st M Nautilus.package/AbstractNautilusUI.class/instance/buttons behavior/commentButtonIcon.st M Nautilus.package/AbstractNautilusUI.class/instance/buttons behavior/hierarchyButtonIcon.st M Nautilus.package/AbstractNautilusUI.class/instance/buttons behavior/instanceButtonIcon.st M Nautilus.package/AbstractNautilusUI.class/instance/icon/classIconFor_.st M Nautilus.package/AbstractNautilusUI.class/instance/icon/groupIconFor_.st M Nautilus.package/AbstractNautilusUI.class/instance/icon/packageIconFor_.st M Nautilus.package/AbstractNautilusUI.class/instance/system announcements/testCaseStarted_.st M ProfStef-Core.package/ProfStef.class/class/zen/menuCommandOn_.st M Reflectivity-Examples.package/MetalinkIconStyler.class/instance/defaults/iconFor_.st M Reflectivity-Tools.package/BreakpointIconStyler.class/instance/defaults/iconFor_.st M Rubric.package/RubLineNumberDisplayer.class/class/menu declaration/menuOn_.st M Rubric.package/RubLipsumWithSegmentsExample.class/instance/user interface/newScrolledText.st M Rubric.package/RubPlainTextMode.class/class/menu/menuOn_.st M Rubric.package/RubSmalltalkCodeMode.class/class/menu/menuOn_.st M Rubric.package/RubSmalltalkEditor.class/class/accessing/menuOn_.st M ScriptLoader60.package/ScriptLoader.class/class/menu/menuCommandOn_.st R ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60033.st A ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60034.st R ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60033.st A ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60034.st M ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st M Shout.package/SHPreferences.class/class/settings/settingsOn_.st A Spec-Core.package/ComposableModel.class/instance/icon/iconNamed_.st A Spec-Core.package/ComposableModel.class/instance/icon/icon_.st M Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/addItem.st M Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/addItemTo_.st M Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/initializeWidgets.st M Spec-Examples.package/ApplicationWithToolbar.class/instance/initialization/subMenu.st A Spec-Inspector.package/AbstractEyeElement.class/instance/icon/iconNamed_.st M Spec-Inspector.package/AbstractEyeElement.class/instance/menu/errorSubMenu_.st R Spec-Inspector.package/SelfEyeElement.class/instance/action/browseInstClassVariable.st A Spec-Inspector.package/SelfEyeElement.class/instance/action/browseInstClassVariables.st A System-Model.package/Model.class/class/utils-icons/iconNamed_.st A System-Model.package/Model.class/instance/icon/iconNamed_.st M System-Settings.package/SettingBrowser.class/class/world menu/menuCommandOn_.st A Tool-Base.package/AbstractTool.class/instance/icon/iconNamed_.st A Tool-Base.package/AbstractTool.class/instance/icon/icon_.st M Tool-Catalog.package/CatalogBrowser.class/instance/menu/defineAllRepositoriesInMCBrowserButton_.st M Tool-Catalog.package/CatalogBrowser.class/instance/menu/defineCurrentVersionRepositoryButton_.st M Tool-Catalog.package/CatalogBrowser.class/instance/menu/installStableVersionButton_.st M Tool-Catalog.package/CatalogBrowser.class/instance/menu/installStableVersionMenuItem_.st M Tool-FileList.package/FileList.class/class/menu/contentMenu_.st A Tool-FileList.package/FileList.class/class/menu/iconNamed_.st Log Message: ----------- 60034 18302 icons -> icons iconNamed: (part 1) https://pharo.fogbugz.com/f/cases/18302 http://files.pharo.org/image/60/60034.zip

May 25, 2016

Re: [Pharo-dev] slice/merge conflict with package AST-FFI-Pharo50Compatibility

by stepharo

hi nicolai let me know when this is ready to integrate. We are trying to purge the queue but sometimes I end up redoing the changes in fast mode. Stef Le 25/5/16 Ã 00:06, Nicolai Hess a Ã©crit : > > > 2016-05-24 23:51 GMT+02:00 Henrik Nergaard <henrik.nergaard(a)uia.no > <mailto:henrik.nergaard@uia.no>>: > > When trying to load the Slice for 17696 from pharo60Inbox I get: > âMessageNotUnderstood: receiver of "dependencies" is nilâ when it > tries to load AST-FFI-Pharo50Compatibility. > > I think you need to reset the package cache/folder? > > You might also I need to do the slice again (without loading the > previous), and ensure that the author set when uploading the slice > is not the same as similar slices in the repo so it will not > create dependencies of it ( ie before creating the slice do: > âAuthor fullname: â_NicolaiHessâ > > > Thanks, I think cleaning the package cache folder did the trick. It > seems to work now. > > Best regards, > > Henrik > > *From:*Pharo-dev [mailto:pharo-dev-bounces@lists.pharo.org > <mailto:pharo-dev-bounces@lists.pharo.org>] *On Behalf Of *Nicolai > Hess > *Sent:* Tuesday, May 24, 2016 11:38 PM > *To:* Pharo Development List <pharo-dev(a)lists.pharo.org > <mailto:pharo-dev@lists.pharo.org>> > *Subject:* [Pharo-dev] slice/merge conflict with package > AST-FFI-Pharo50Compatibility > > I need help with issues > 17696 > <https://pharo.fogbugz.com/f/cases/17696/RBParser-should-not-allow-variable-…> > RBParser should not allow variable names for pragma arguments > 17994 > <https://pharo.fogbugz.com/f/cases/17994/RBParserNode-allowed-primitive-prag…> > RBParserNode: allowed primitive pragma definition can not compile > > for both issues I created a slice that will modify methods from > package > AST-FFI-Pharo50Compatibility, but merging this slices shows a > merge conflict. > > I don't know what is wrong or how I could solve this. > > any help appreciated. > > nicolai > >

May 25, 2016