January 2016 - Pharo-dev - lists.pharo.org

Re: [Pharo-dev] Rubric: spotter with preview leaks some memory

by Nicolai Hess

2016-01-20 19:18 GMT+01:00 Nicolai Hess <nicolaihess(a)gmail.com>: > > > 2016-01-20 14:47 GMT+01:00 Andrei Chis <chisvasileandrei(a)gmail.com>: > >> Tried it in the last latest image and if I execute before #garbageCollect >> I just get 4 instances. >> >> Smalltalk garbageCollect. >> RubTextLine allInstances size "4" >> >> Now indeed if I browse the same class in nautilus I get a much smaller >> number of RubTextLine instances >> > > > I opened a bugreport > 17437 > <https://pharo.fogbugz.com/f/cases/17437/Rubric-spotter-with-preview-leaks-s…> > > Rubric: spotter with preview leaks some memory > I tried to reproduce this behavior with GTInspector instead of Spotter, for example, inspect: MethodFinder methods select on entry, -> another inspector pane shows up. Select th "Source"-tab. Now scroll through the list of methods in the first inspector pane. For every method the second pane updates the source tab with the code of the selected method. This generates many RubTextLine instances too. But not as many and I can always clean them up with Smalltalk garbageCollect. So, the is something that spotter does differently. > > > > >> >> On Wed, Jan 20, 2016 at 2:32 PM, Nicolai Hess <nicolaihess(a)gmail.com> >> wrote: >> >>> Open fresh image 50536 >>> Open Spotter, >>> enable preview (cmd+p) >>> search for EllipseMorph >>> dive in instance-methods >>> scroll through the list one item after another. >>> >>> open playground >>> evaluate >>> RubTextLine allInstances size. "553896" >>> >>> >>> case 17421 is related to this, but does not fully solves this. >>> please review and comment on that fix, >>> so we can integrate this soon. >>> >>> The problem sometimes remains even with this fix. The memory >>> (instance count of RubTextLine) just grows in the background >>> >> >> >

Jan. 20, 2016

Re: [Pharo-dev] [ANN] OSSubprocess v0.2.0 release

by Mariano Martinez Peck

Stef, I made quite a re-organization of the readme..basically moved around a couple of sections. I am working on the dev branch. If you already started, don't worry, make the PR and I merge it. If you did NOT yet started, then start from the dev branch :) BTW, this is how it looks the new readme in dev: https://github.com/marianopeck/OSSubprocess/tree/dev On Wed, Jan 20, 2016 at 5:18 PM, Mariano Martinez Peck < marianopeck(a)gmail.com> wrote: > > > On Wed, Jan 20, 2016 at 5:11 PM, stepharo <stepharo(a)free.fr> wrote: > >> Mariano your doc is gorgeous. >> >> I'm reading it and I will do a pull request with some typos! >> >> > Thanks! That will be very much appreciated. Honestly, I could not spend > much time in improving the "grammar / english" text of the doc. So any > improvement in that area is appreciated! > > > > >> >> Le 20/1/16 02:06, Mariano Martinez Peck a Ã©crit : >> >> Hi guys, >>> >>> I am happy to announce OSSubprocess v0.2.0. You can see the changelog >>> here: https://github.com/marianopeck/OSSubprocess/releases/tag/v0.2.0 >>> Such version becomes the #stable, so the installation instructions >>> remain the same. >>> Note that I have improved and added more info in the documentation. >>> >>> I took into account most of the feedback I received in the first release >>> plus some other stuff from the survey. >>> >>> If you have more feedback, just let me know! >>> >>> Hope you enjoy. >>> >>> Best, >>> >>> -- >>> Mariano >>> http://marianopeck.wordpress.com >>> >> >> >> > > > -- > Mariano > http://marianopeck.wordpress.com > -- Mariano http://marianopeck.wordpress.com

Jan. 20, 2016

Re: [Pharo-dev] [ANN] OSSubprocess v0.2.0 release

by Mariano Martinez Peck

On Wed, Jan 20, 2016 at 5:11 PM, stepharo <stepharo(a)free.fr> wrote: > Mariano your doc is gorgeous. > > I'm reading it and I will do a pull request with some typos! > > Thanks! That will be very much appreciated. Honestly, I could not spend much time in improving the "grammar / english" text of the doc. So any improvement in that area is appreciated! > > Le 20/1/16 02:06, Mariano Martinez Peck a Ã©crit : > > Hi guys, >> >> I am happy to announce OSSubprocess v0.2.0. You can see the changelog >> here: https://github.com/marianopeck/OSSubprocess/releases/tag/v0.2.0 >> Such version becomes the #stable, so the installation instructions remain >> the same. >> Note that I have improved and added more info in the documentation. >> >> I took into account most of the feedback I received in the first release >> plus some other stuff from the survey. >> >> If you have more feedback, just let me know! >> >> Hope you enjoy. >> >> Best, >> >> -- >> Mariano >> http://marianopeck.wordpress.com >> > > > -- Mariano http://marianopeck.wordpress.com

Jan. 20, 2016

Re: [Pharo-dev] [ANN] OSSubprocess v0.2.0 release

by stepharo

Mariano your doc is gorgeous. I'm reading it and I will do a pull request with some typos! Le 20/1/16 02:06, Mariano Martinez Peck a Ã©crit : > Hi guys, > > I am happy to announce OSSubprocess v0.2.0. You can see the changelog > here: https://github.com/marianopeck/OSSubprocess/releases/tag/v0.2.0 > Such version becomes the #stable, so the installation instructions > remain the same. > Note that I have improved and added more info in the documentation. > > I took into account most of the feedback I received in the first > release plus some other stuff from the survey. > > If you have more feedback, just let me know! > > Hope you enjoy. > > Best, > > -- > Mariano > http://marianopeck.wordpress.com

Jan. 20, 2016

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

by Damien Pollet

I rebuilt the image, then reloaded OSSubprocess from my own clone, on top of the one loaded by GitFileTree no metadata reappeared (so farâ¦) On 20 January 2016 at 20:45, Mariano Martinez Peck <marianopeck(a)gmail.com> wrote: > No, something wrong is happening. GitFileTree should have NOT generated > neither "version" nor "methodProperties" files. > :( > > On Wed, Jan 20, 2016 at 4:37 PM, Damien Pollet <damien.pollet(a)gmail.com> > wrote: > >> So ? I put *.methodProperties in .gitignore ? >> What about .gitattributes for the merge driver ? >> >> On 20 January 2016 at 20:19, Mariano Martinez Peck <marianopeck(a)gmail.com >> > wrote: >> >>> Damien, I think the "metadata-less" name is a bit wrong. I think you did >>> it correct. >>> The metadataless is that only SOME of the metadata is ignored, such as >>> "version" and I don't remember what else. >>> I am comparing the HEAD of your clone with mine and we seem to have the >>> same .filetree and .json so I think we are fine. >>> >>> >>> >>> On Wed, Jan 20, 2016 at 4:09 PM, Damien Pollet <damien.pollet(a)gmail.com> >>> wrote: >>> >>>> Hm. I saved code in a clone of Mariano's project, and a bunch of >>>> metadata files were created. Did I miss a step on configuring the repo so >>>> it's metadataless ? >>>> >>>> On 16 January 2016 at 15:18, Mariano Martinez Peck < >>>> marianopeck(a)gmail.com> wrote: >>>> >>>>> OK, thanks Thierry. >>>>> >>>>> BTW, thanks for all the help you have been giving me in the last weeks >>>>> and for your great GitFileTree :) >>>>> >>>>> On Sat, Jan 16, 2016 at 11:14 AM, Thierry Goubier < >>>>> thierry.goubier(a)gmail.com> wrote: >>>>> >>>>>> Le 16/01/2016 15:06, Mariano Martinez Peck a Ã©crit : >>>>>> >>>>>>> >>>>>>> >>>>>>> On Sat, Jan 16, 2016 at 5:15 AM, Thierry Goubier >>>>>>> <thierry.goubier(a)gmail.com <mailto:thierry.goubier@gmail.com>> >>>>>>> wrote: >>>>>>> >>>>>>> Le 16/01/2016 03:23, Mariano Martinez Peck a Ã©crit : >>>>>>> >>>>>>> Hi guys, >>>>>>> >>>>>>> First, let me say that I found very cool that I can do a "git >>>>>>> checkout >>>>>>> X" from command line, and from Pharo, opening the MC browser >>>>>>> detects I >>>>>>> am in another branch and everything seems to work. So I guess >>>>>>> that's the >>>>>>> way I manage branches? Simply "git checkout X" and then go >>>>>>> to MC >>>>>>> , and >>>>>>> do a "load" of the last version of the repo? (or another >>>>>>> image, >>>>>>> whatever). >>>>>>> >>>>>>> >>>>>>> Yes, exactly. >>>>>>> >>>>>>> >>>>>>> OK. >>>>>>> >>>>>>> >>>>>>> >>>>>>> The problem is now with merging. Not necessary about the >>>>>>> metadata ( I >>>>>>> guess we have less metadata conflicts with Metadata-less >>>>>>> GitFileTree >>>>>>> right???) , but real code changes conflicts between branches. >>>>>>> How do you >>>>>>> manage this? You manage everything at Git level using git and >>>>>>> text editors? >>>>>>> >>>>>>> >>>>>>> yes, or with git gui tools, or with the github interface (if >>>>>>> there >>>>>>> is no conflict). The only thing a bit problematic are the >>>>>>> eventual >>>>>>> conflicts, but, in that metadata-less format, they are less >>>>>>> frequent >>>>>>> and easier to solve. >>>>>>> >>>>>>> >>>>>>> OK... but let me confirm... with metadata-less gitfiletree, would I >>>>>>> still benefit from >>>>>>> https://github.com/ThierryGoubier/GitFileTree-MergeDriver >>>>>>> to minimize conflicts? >>>>>>> Or that was when you were having filetree with metadata? >>>>>>> >>>>>> >>>>>> The merge driver does three things: >>>>>> - merge metadata version files >>>>>> - merge method properties json files >>>>>> - merge class definition json files (merge instances variables from >>>>>> both branches) >>>>>> >>>>>> Items one and two do not exist anymore in metadata-less format. Third >>>>>> one is not allways seen as a good thing. >>>>>> >>>>>> So the merge driver is rarely usefull in metadata-less mode. >>>>>> >>>>>> I cannot think how to do that from MC browser "Merge" because >>>>>>> MC >>>>>>> sees >>>>>>> only one repo associated to one current branch. >>>>>>> >>>>>>> >>>>>>> It is possible to do the merge in MC (think of merging your >>>>>>> current >>>>>>> working copy and the top of the branch) but they won't be >>>>>>> recorded >>>>>>> in the git log as a merge. >>>>>>> >>>>>>> >>>>>>> OK. I prefer git to see it as a merge. But thanks anyway. >>>>>>> >>>>>> >>>>>> I understand and do the same. Moreover, git is better than MC in my >>>>>> opinion to do the merge properly. >>>>>> >>>>>> Thierry >>>>>> >>>>>> >>>>> >>>>> >>>>> -- >>>>> Mariano >>>>> http://marianopeck.wordpress.com >>>>> >>>> >>>> >>>> >>>> -- >>>> Damien Pollet >>>> type less, do more [ | ] http://people.untyped.org/damien.pollet >>>> >>> >>> >>> >>> -- >>> Mariano >>> http://marianopeck.wordpress.com >>> >> >> >> >> -- >> Damien Pollet >> type less, do more [ | ] http://people.untyped.org/damien.pollet >> > > > > -- > Mariano > http://marianopeck.wordpress.com > -- Damien Pollet type less, do more [ | ] http://people.untyped.org/damien.pollet

Jan. 20, 2016

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

by Mariano Martinez Peck

No, something wrong is happening. GitFileTree should have NOT generated neither "version" nor "methodProperties" files. :( On Wed, Jan 20, 2016 at 4:37 PM, Damien Pollet <damien.pollet(a)gmail.com> wrote: > So ? I put *.methodProperties in .gitignore ? > What about .gitattributes for the merge driver ? > > On 20 January 2016 at 20:19, Mariano Martinez Peck <marianopeck(a)gmail.com> > wrote: > >> Damien, I think the "metadata-less" name is a bit wrong. I think you did >> it correct. >> The metadataless is that only SOME of the metadata is ignored, such as >> "version" and I don't remember what else. >> I am comparing the HEAD of your clone with mine and we seem to have the >> same .filetree and .json so I think we are fine. >> >> >> >> On Wed, Jan 20, 2016 at 4:09 PM, Damien Pollet <damien.pollet(a)gmail.com> >> wrote: >> >>> Hm. I saved code in a clone of Mariano's project, and a bunch of >>> metadata files were created. Did I miss a step on configuring the repo so >>> it's metadataless ? >>> >>> On 16 January 2016 at 15:18, Mariano Martinez Peck < >>> marianopeck(a)gmail.com> wrote: >>> >>>> OK, thanks Thierry. >>>> >>>> BTW, thanks for all the help you have been giving me in the last weeks >>>> and for your great GitFileTree :) >>>> >>>> On Sat, Jan 16, 2016 at 11:14 AM, Thierry Goubier < >>>> thierry.goubier(a)gmail.com> wrote: >>>> >>>>> Le 16/01/2016 15:06, Mariano Martinez Peck a Ã©crit : >>>>> >>>>>> >>>>>> >>>>>> On Sat, Jan 16, 2016 at 5:15 AM, Thierry Goubier >>>>>> <thierry.goubier(a)gmail.com <mailto:thierry.goubier@gmail.com>> wrote: >>>>>> >>>>>> Le 16/01/2016 03:23, Mariano Martinez Peck a Ã©crit : >>>>>> >>>>>> Hi guys, >>>>>> >>>>>> First, let me say that I found very cool that I can do a "git >>>>>> checkout >>>>>> X" from command line, and from Pharo, opening the MC browser >>>>>> detects I >>>>>> am in another branch and everything seems to work. So I guess >>>>>> that's the >>>>>> way I manage branches? Simply "git checkout X" and then go to >>>>>> MC >>>>>> , and >>>>>> do a "load" of the last version of the repo? (or another >>>>>> image, >>>>>> whatever). >>>>>> >>>>>> >>>>>> Yes, exactly. >>>>>> >>>>>> >>>>>> OK. >>>>>> >>>>>> >>>>>> >>>>>> The problem is now with merging. Not necessary about the >>>>>> metadata ( I >>>>>> guess we have less metadata conflicts with Metadata-less >>>>>> GitFileTree >>>>>> right???) , but real code changes conflicts between branches. >>>>>> How do you >>>>>> manage this? You manage everything at Git level using git and >>>>>> text editors? >>>>>> >>>>>> >>>>>> yes, or with git gui tools, or with the github interface (if there >>>>>> is no conflict). The only thing a bit problematic are the eventual >>>>>> conflicts, but, in that metadata-less format, they are less >>>>>> frequent >>>>>> and easier to solve. >>>>>> >>>>>> >>>>>> OK... but let me confirm... with metadata-less gitfiletree, would I >>>>>> still benefit from >>>>>> https://github.com/ThierryGoubier/GitFileTree-MergeDriver >>>>>> to minimize conflicts? >>>>>> Or that was when you were having filetree with metadata? >>>>>> >>>>> >>>>> The merge driver does three things: >>>>> - merge metadata version files >>>>> - merge method properties json files >>>>> - merge class definition json files (merge instances variables from >>>>> both branches) >>>>> >>>>> Items one and two do not exist anymore in metadata-less format. Third >>>>> one is not allways seen as a good thing. >>>>> >>>>> So the merge driver is rarely usefull in metadata-less mode. >>>>> >>>>> I cannot think how to do that from MC browser "Merge" because >>>>>> MC >>>>>> sees >>>>>> only one repo associated to one current branch. >>>>>> >>>>>> >>>>>> It is possible to do the merge in MC (think of merging your >>>>>> current >>>>>> working copy and the top of the branch) but they won't be recorded >>>>>> in the git log as a merge. >>>>>> >>>>>> >>>>>> OK. I prefer git to see it as a merge. But thanks anyway. >>>>>> >>>>> >>>>> I understand and do the same. Moreover, git is better than MC in my >>>>> opinion to do the merge properly. >>>>> >>>>> Thierry >>>>> >>>>> >>>> >>>> >>>> -- >>>> Mariano >>>> http://marianopeck.wordpress.com >>>> >>> >>> >>> >>> -- >>> Damien Pollet >>> type less, do more [ | ] http://people.untyped.org/damien.pollet >>> >> >> >> >> -- >> Mariano >> http://marianopeck.wordpress.com >> > > > > -- > Damien Pollet > type less, do more [ | ] http://people.untyped.org/damien.pollet > -- Mariano http://marianopeck.wordpress.com

Jan. 20, 2016

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

by Damien Pollet

So ? I put *.methodProperties in .gitignore ? What about .gitattributes for the merge driver ? On 20 January 2016 at 20:19, Mariano Martinez Peck <marianopeck(a)gmail.com> wrote: > Damien, I think the "metadata-less" name is a bit wrong. I think you did > it correct. > The metadataless is that only SOME of the metadata is ignored, such as > "version" and I don't remember what else. > I am comparing the HEAD of your clone with mine and we seem to have the > same .filetree and .json so I think we are fine. > > > > On Wed, Jan 20, 2016 at 4:09 PM, Damien Pollet <damien.pollet(a)gmail.com> > wrote: > >> Hm. I saved code in a clone of Mariano's project, and a bunch of metadata >> files were created. Did I miss a step on configuring the repo so it's >> metadataless ? >> >> On 16 January 2016 at 15:18, Mariano Martinez Peck <marianopeck(a)gmail.com >> > wrote: >> >>> OK, thanks Thierry. >>> >>> BTW, thanks for all the help you have been giving me in the last weeks >>> and for your great GitFileTree :) >>> >>> On Sat, Jan 16, 2016 at 11:14 AM, Thierry Goubier < >>> thierry.goubier(a)gmail.com> wrote: >>> >>>> Le 16/01/2016 15:06, Mariano Martinez Peck a Ã©crit : >>>> >>>>> >>>>> >>>>> On Sat, Jan 16, 2016 at 5:15 AM, Thierry Goubier >>>>> <thierry.goubier(a)gmail.com <mailto:thierry.goubier@gmail.com>> wrote: >>>>> >>>>> Le 16/01/2016 03:23, Mariano Martinez Peck a Ã©crit : >>>>> >>>>> Hi guys, >>>>> >>>>> First, let me say that I found very cool that I can do a "git >>>>> checkout >>>>> X" from command line, and from Pharo, opening the MC browser >>>>> detects I >>>>> am in another branch and everything seems to work. So I guess >>>>> that's the >>>>> way I manage branches? Simply "git checkout X" and then go to >>>>> MC >>>>> , and >>>>> do a "load" of the last version of the repo? (or another >>>>> image, >>>>> whatever). >>>>> >>>>> >>>>> Yes, exactly. >>>>> >>>>> >>>>> OK. >>>>> >>>>> >>>>> >>>>> The problem is now with merging. Not necessary about the >>>>> metadata ( I >>>>> guess we have less metadata conflicts with Metadata-less >>>>> GitFileTree >>>>> right???) , but real code changes conflicts between branches. >>>>> How do you >>>>> manage this? You manage everything at Git level using git and >>>>> text editors? >>>>> >>>>> >>>>> yes, or with git gui tools, or with the github interface (if there >>>>> is no conflict). The only thing a bit problematic are the eventual >>>>> conflicts, but, in that metadata-less format, they are less >>>>> frequent >>>>> and easier to solve. >>>>> >>>>> >>>>> OK... but let me confirm... with metadata-less gitfiletree, would I >>>>> still benefit from >>>>> https://github.com/ThierryGoubier/GitFileTree-MergeDriver >>>>> to minimize conflicts? >>>>> Or that was when you were having filetree with metadata? >>>>> >>>> >>>> The merge driver does three things: >>>> - merge metadata version files >>>> - merge method properties json files >>>> - merge class definition json files (merge instances variables from >>>> both branches) >>>> >>>> Items one and two do not exist anymore in metadata-less format. Third >>>> one is not allways seen as a good thing. >>>> >>>> So the merge driver is rarely usefull in metadata-less mode. >>>> >>>> I cannot think how to do that from MC browser "Merge" because MC >>>>> sees >>>>> only one repo associated to one current branch. >>>>> >>>>> >>>>> It is possible to do the merge in MC (think of merging your current >>>>> working copy and the top of the branch) but they won't be recorded >>>>> in the git log as a merge. >>>>> >>>>> >>>>> OK. I prefer git to see it as a merge. But thanks anyway. >>>>> >>>> >>>> I understand and do the same. Moreover, git is better than MC in my >>>> opinion to do the merge properly. >>>> >>>> Thierry >>>> >>>> >>> >>> >>> -- >>> Mariano >>> http://marianopeck.wordpress.com >>> >> >> >> >> -- >> Damien Pollet >> type less, do more [ | ] http://people.untyped.org/damien.pollet >> > > > > -- > Mariano > http://marianopeck.wordpress.com > -- Damien Pollet type less, do more [ | ] http://people.untyped.org/damien.pollet

Jan. 20, 2016

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

by Mariano Martinez Peck

Damien, I think the "metadata-less" name is a bit wrong. I think you did it correct. The metadataless is that only SOME of the metadata is ignored, such as "version" and I don't remember what else. I am comparing the HEAD of your clone with mine and we seem to have the same .filetree and .json so I think we are fine. On Wed, Jan 20, 2016 at 4:09 PM, Damien Pollet <damien.pollet(a)gmail.com> wrote: > Hm. I saved code in a clone of Mariano's project, and a bunch of metadata > files were created. Did I miss a step on configuring the repo so it's > metadataless ? > > On 16 January 2016 at 15:18, Mariano Martinez Peck <marianopeck(a)gmail.com> > wrote: > >> OK, thanks Thierry. >> >> BTW, thanks for all the help you have been giving me in the last weeks >> and for your great GitFileTree :) >> >> On Sat, Jan 16, 2016 at 11:14 AM, Thierry Goubier < >> thierry.goubier(a)gmail.com> wrote: >> >>> Le 16/01/2016 15:06, Mariano Martinez Peck a Ã©crit : >>> >>>> >>>> >>>> On Sat, Jan 16, 2016 at 5:15 AM, Thierry Goubier >>>> <thierry.goubier(a)gmail.com <mailto:thierry.goubier@gmail.com>> wrote: >>>> >>>> Le 16/01/2016 03:23, Mariano Martinez Peck a Ã©crit : >>>> >>>> Hi guys, >>>> >>>> First, let me say that I found very cool that I can do a "git >>>> checkout >>>> X" from command line, and from Pharo, opening the MC browser >>>> detects I >>>> am in another branch and everything seems to work. So I guess >>>> that's the >>>> way I manage branches? Simply "git checkout X" and then go to MC >>>> , and >>>> do a "load" of the last version of the repo? (or another image, >>>> whatever). >>>> >>>> >>>> Yes, exactly. >>>> >>>> >>>> OK. >>>> >>>> >>>> >>>> The problem is now with merging. Not necessary about the >>>> metadata ( I >>>> guess we have less metadata conflicts with Metadata-less >>>> GitFileTree >>>> right???) , but real code changes conflicts between branches. >>>> How do you >>>> manage this? You manage everything at Git level using git and >>>> text editors? >>>> >>>> >>>> yes, or with git gui tools, or with the github interface (if there >>>> is no conflict). The only thing a bit problematic are the eventual >>>> conflicts, but, in that metadata-less format, they are less frequent >>>> and easier to solve. >>>> >>>> >>>> OK... but let me confirm... with metadata-less gitfiletree, would I >>>> still benefit from >>>> https://github.com/ThierryGoubier/GitFileTree-MergeDriver >>>> to minimize conflicts? >>>> Or that was when you were having filetree with metadata? >>>> >>> >>> The merge driver does three things: >>> - merge metadata version files >>> - merge method properties json files >>> - merge class definition json files (merge instances variables from both >>> branches) >>> >>> Items one and two do not exist anymore in metadata-less format. Third >>> one is not allways seen as a good thing. >>> >>> So the merge driver is rarely usefull in metadata-less mode. >>> >>> I cannot think how to do that from MC browser "Merge" because MC >>>> sees >>>> only one repo associated to one current branch. >>>> >>>> >>>> It is possible to do the merge in MC (think of merging your current >>>> working copy and the top of the branch) but they won't be recorded >>>> in the git log as a merge. >>>> >>>> >>>> OK. I prefer git to see it as a merge. But thanks anyway. >>>> >>> >>> I understand and do the same. Moreover, git is better than MC in my >>> opinion to do the merge properly. >>> >>> Thierry >>> >>> >> >> >> -- >> Mariano >> http://marianopeck.wordpress.com >> > > > > -- > Damien Pollet > type less, do more [ | ] http://people.untyped.org/damien.pollet > -- Mariano http://marianopeck.wordpress.com

Jan. 20, 2016

Re: [Pharo-dev] Pharo bootstrap

by Brad Selfridge

Has anyone looked at the VASmalltalk Envy Packager. It let's one decide whether you want to package a headless or UI image. It then allows one to define packaging instructions, that are saved with the new application), that get fed into the packager. The instructions define prerequisite apps, un-referenced methods, etc. When one defines a new application (package), one can define prerequisite applications that have to be installed before the current application is installed. This prerequisite chain is used in loading the application from Envy and in packaging. Seems to work fairly well. Doesn't take too long to package an app and give the developer pretty fine control over the packaging and loading process. ----- Brad Selfridge -- View this message in context: http://forum.world.st/ANN-Pharo-bootstrap-tp4872633p4872989.html Sent from the Pharo Smalltalk Developers mailing list archive at Nabble.com.

Jan. 20, 2016

Re: [Pharo-dev] How do you normally merge Git branches with Metadata-less GitFileTree?

by Damien Pollet

Hm. I saved code in a clone of Mariano's project, and a bunch of metadata files were created. Did I miss a step on configuring the repo so it's metadataless ? On 16 January 2016 at 15:18, Mariano Martinez Peck <marianopeck(a)gmail.com> wrote: > OK, thanks Thierry. > > BTW, thanks for all the help you have been giving me in the last weeks and > for your great GitFileTree :) > > On Sat, Jan 16, 2016 at 11:14 AM, Thierry Goubier < > thierry.goubier(a)gmail.com> wrote: > >> Le 16/01/2016 15:06, Mariano Martinez Peck a Ã©crit : >> >>> >>> >>> On Sat, Jan 16, 2016 at 5:15 AM, Thierry Goubier >>> <thierry.goubier(a)gmail.com <mailto:thierry.goubier@gmail.com>> wrote: >>> >>> Le 16/01/2016 03:23, Mariano Martinez Peck a Ã©crit : >>> >>> Hi guys, >>> >>> First, let me say that I found very cool that I can do a "git >>> checkout >>> X" from command line, and from Pharo, opening the MC browser >>> detects I >>> am in another branch and everything seems to work. So I guess >>> that's the >>> way I manage branches? Simply "git checkout X" and then go to MC >>> , and >>> do a "load" of the last version of the repo? (or another image, >>> whatever). >>> >>> >>> Yes, exactly. >>> >>> >>> OK. >>> >>> >>> >>> The problem is now with merging. Not necessary about the >>> metadata ( I >>> guess we have less metadata conflicts with Metadata-less >>> GitFileTree >>> right???) , but real code changes conflicts between branches. >>> How do you >>> manage this? You manage everything at Git level using git and >>> text editors? >>> >>> >>> yes, or with git gui tools, or with the github interface (if there >>> is no conflict). The only thing a bit problematic are the eventual >>> conflicts, but, in that metadata-less format, they are less frequent >>> and easier to solve. >>> >>> >>> OK... but let me confirm... with metadata-less gitfiletree, would I >>> still benefit from >>> https://github.com/ThierryGoubier/GitFileTree-MergeDriver >>> to minimize conflicts? >>> Or that was when you were having filetree with metadata? >>> >> >> The merge driver does three things: >> - merge metadata version files >> - merge method properties json files >> - merge class definition json files (merge instances variables from both >> branches) >> >> Items one and two do not exist anymore in metadata-less format. Third one >> is not allways seen as a good thing. >> >> So the merge driver is rarely usefull in metadata-less mode. >> >> I cannot think how to do that from MC browser "Merge" because MC >>> sees >>> only one repo associated to one current branch. >>> >>> >>> It is possible to do the merge in MC (think of merging your current >>> working copy and the top of the branch) but they won't be recorded >>> in the git log as a merge. >>> >>> >>> OK. I prefer git to see it as a merge. But thanks anyway. >>> >> >> I understand and do the same. Moreover, git is better than MC in my >> opinion to do the merge properly. >> >> Thierry >> >> > > > -- > Mariano > http://marianopeck.wordpress.com > -- Damien Pollet type less, do more [ | ] http://people.untyped.org/damien.pollet

Jan. 20, 2016