- Pharo-dev - lists.pharo.org

Re: [Pharo-project] Blocked while merging

by StÃ©phane Ducasse

I will retry and put an image somewhere. Stef > ----- Original Message ----- > From: "StÃ©phane Ducasse" <stephane.ducasse(a)inria.fr> > To: <Pharo-project(a)lists.gforge.inria.fr> > Sent: Thursday, March 12, 2009 2:21 PM > Subject: Re: [Pharo-project] Blocked while merging > > > apparently I redid a merge and I got blocked again so I do not know > what to do. > > next remoteDefinition is nil :( > > Stef > >>> Try replacing PSMCMergePatchMorph>>selectNextConflict with: >>> >>> selectNextConflict >>> "Select the next conflict after the current selection, if any." >>> >>> |next def| >>> next := self nextConflict ifNil: [^self]. >>> def := next remoteDefinition ifNil: [next localDefinition]. >>> self changed: {#changes. #openPath. next targetClassName asString. >>> def >>> selector asString} >>> >>> And, if that works in your case I'll version up the change and put >>> on >>> SqueakSource. >>> >>> None of these issues should actually prevent you from merging, as >>> such >>> though. >>> >>> Regards, Gary >>> >>> ----- Original Message ----- >>> From: "StÃ©phane Ducasse" <stephane.ducasse(a)inria.fr> >>> To: <Pharo-project(a)lists.gforge.inria.fr> >>> Sent: Tuesday, March 10, 2009 10:22 AM >>> Subject: Re: [Pharo-project] Blocked while merging >>> >>> >>> Hi all >>> >>> did you see this mail >>> because I'm really blocked and cannot merge anymore in pharo. >>> >>> Stef >>> On Mar 9, 2009, at 1:56 PM, StÃ©phane Ducasse wrote: >>> >>>> Hi all >>>> >>>> I wanted to merge and I tried with the new Diff tools and I got a >>>> selector DNU, >>>> so I switched back to the old merge tool but I got the following >>>> bugs >>>> >>>> - click on an item >>>> bring the menu revertSelection -> DNU >>>> diff -> DNU >>>> install crahsed. >>>> >>>> Does anybody get the same, I'm using pharo 10248 >>>> >>>> Stef >>>> >>>> >>>> _______________________________________________ >>>> Pharo-project mailing list >>>> Pharo-project(a)lists.gforge.inria.fr >>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>>> >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> Pharo-project(a)lists.gforge.inria.fr >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> Pharo-project(a)lists.gforge.inria.fr >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >> >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >

March 12, 2009

Re: [Pharo-project] Blocked while merging

by Gary Chambers

What is "blocking" you exactly? Regards, Gary ----- Original Message ----- From: "StÃ©phane Ducasse" <stephane.ducasse(a)inria.fr> To: <Pharo-project(a)lists.gforge.inria.fr> Sent: Thursday, March 12, 2009 2:21 PM Subject: Re: [Pharo-project] Blocked while merging apparently I redid a merge and I got blocked again so I do not know what to do. next remoteDefinition is nil :( Stef >> Try replacing PSMCMergePatchMorph>>selectNextConflict with: >> >> selectNextConflict >> "Select the next conflict after the current selection, if any." >> >> |next def| >> next := self nextConflict ifNil: [^self]. >> def := next remoteDefinition ifNil: [next localDefinition]. >> self changed: {#changes. #openPath. next targetClassName asString. >> def >> selector asString} >> >> And, if that works in your case I'll version up the change and put on >> SqueakSource. >> >> None of these issues should actually prevent you from merging, as >> such >> though. >> >> Regards, Gary >> >> ----- Original Message ----- >> From: "StÃ©phane Ducasse" <stephane.ducasse(a)inria.fr> >> To: <Pharo-project(a)lists.gforge.inria.fr> >> Sent: Tuesday, March 10, 2009 10:22 AM >> Subject: Re: [Pharo-project] Blocked while merging >> >> >> Hi all >> >> did you see this mail >> because I'm really blocked and cannot merge anymore in pharo. >> >> Stef >> On Mar 9, 2009, at 1:56 PM, StÃ©phane Ducasse wrote: >> >>> Hi all >>> >>> I wanted to merge and I tried with the new Diff tools and I got a >>> selector DNU, >>> so I switched back to the old merge tool but I got the following >>> bugs >>> >>> - click on an item >>> bring the menu revertSelection -> DNU >>> diff -> DNU >>> install crahsed. >>> >>> Does anybody get the same, I'm using pharo 10248 >>> >>> Stef >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> Pharo-project(a)lists.gforge.inria.fr >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >> >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > _______________________________________________ Pharo-project mailing list Pharo-project(a)lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

March 12, 2009

Re: [Pharo-project] Blocked while merging

by Adrian Lienhard

Yesterday I merged and it worked. I got this error when clicking on the button on the left side of the window ("2 conflicts" or something). Adrian On Mar 12, 2009, at 15:21 , StÃ©phane Ducasse wrote: > apparently I redid a merge and I got blocked again so I do not know > what to do. > > next remoteDefinition is nil :( > > Stef > >>> Try replacing PSMCMergePatchMorph>>selectNextConflict with: >>> >>> selectNextConflict >>> "Select the next conflict after the current selection, if any." >>> >>> |next def| >>> next := self nextConflict ifNil: [^self]. >>> def := next remoteDefinition ifNil: [next localDefinition]. >>> self changed: {#changes. #openPath. next targetClassName asString. >>> def >>> selector asString} >>> >>> And, if that works in your case I'll version up the change and put >>> on >>> SqueakSource. >>> >>> None of these issues should actually prevent you from merging, as >>> such >>> though. >>> >>> Regards, Gary >>> >>> ----- Original Message ----- >>> From: "StÃ©phane Ducasse" <stephane.ducasse(a)inria.fr> >>> To: <Pharo-project(a)lists.gforge.inria.fr> >>> Sent: Tuesday, March 10, 2009 10:22 AM >>> Subject: Re: [Pharo-project] Blocked while merging >>> >>> >>> Hi all >>> >>> did you see this mail >>> because I'm really blocked and cannot merge anymore in pharo. >>> >>> Stef >>> On Mar 9, 2009, at 1:56 PM, StÃ©phane Ducasse wrote: >>> >>>> Hi all >>>> >>>> I wanted to merge and I tried with the new Diff tools and I got a >>>> selector DNU, >>>> so I switched back to the old merge tool but I got the following >>>> bugs >>>> >>>> - click on an item >>>> bring the menu revertSelection -> DNU >>>> diff -> DNU >>>> install crahsed. >>>> >>>> Does anybody get the same, I'm using pharo 10248 >>>> >>>> Stef >>>> >>>> >>>> _______________________________________________ >>>> Pharo-project mailing list >>>> Pharo-project(a)lists.gforge.inria.fr >>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>>> >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> Pharo-project(a)lists.gforge.inria.fr >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> Pharo-project(a)lists.gforge.inria.fr >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >> >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

March 12, 2009

Re: [Pharo-project] Blocked while merging

by StÃ©phane Ducasse

apparently I redid a merge and I got blocked again so I do not know what to do. next remoteDefinition is nil :( Stef >> Try replacing PSMCMergePatchMorph>>selectNextConflict with: >> >> selectNextConflict >> "Select the next conflict after the current selection, if any." >> >> |next def| >> next := self nextConflict ifNil: [^self]. >> def := next remoteDefinition ifNil: [next localDefinition]. >> self changed: {#changes. #openPath. next targetClassName asString. >> def >> selector asString} >> >> And, if that works in your case I'll version up the change and put on >> SqueakSource. >> >> None of these issues should actually prevent you from merging, as >> such >> though. >> >> Regards, Gary >> >> ----- Original Message ----- >> From: "StÃ©phane Ducasse" <stephane.ducasse(a)inria.fr> >> To: <Pharo-project(a)lists.gforge.inria.fr> >> Sent: Tuesday, March 10, 2009 10:22 AM >> Subject: Re: [Pharo-project] Blocked while merging >> >> >> Hi all >> >> did you see this mail >> because I'm really blocked and cannot merge anymore in pharo. >> >> Stef >> On Mar 9, 2009, at 1:56 PM, StÃ©phane Ducasse wrote: >> >>> Hi all >>> >>> I wanted to merge and I tried with the new Diff tools and I got a >>> selector DNU, >>> so I switched back to the old merge tool but I got the following >>> bugs >>> >>> - click on an item >>> bring the menu revertSelection -> DNU >>> diff -> DNU >>> install crahsed. >>> >>> Does anybody get the same, I'm using pharo 10248 >>> >>> Stef >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> Pharo-project(a)lists.gforge.inria.fr >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >> >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >

March 12, 2009

Re: [Pharo-project] [ANN][Dev-Images] March 2009 versions

by Damien Cassou

On Wed, Mar 11, 2009 at 4:43 AM, Schwab,Wilhelm K <bschwab(a)anest.ufl.edu> wrote: > Do you have plans for a Pharo web image? Done: http://code.google.com/p/pharo/wiki/Downloads Tell me if that works fine for you -- Damien Cassou http://damiencassou.seasidehosting.st

March 12, 2009

[Pharo-project] New Pharo-dev AND web based on 10250

by Damien Cassou

Hi, I've just uploaded pharo-dev and pharo-web based on 10250. Please try them and tell me. http://code.google.com/p/pharo/wiki/Downloads. If you have a recent VM with the FT2Plugin and the DejaVu font, execute the following: (you can of course change the font name to something else) |font codeFont| font := LogicalFont familyName: 'DejaVu Serif' pointSize: 10. codeFont := LogicalFont familyName: 'DejaVu Sans Mono' pointSize: 9. Preferences setListFontTo: font. Preferences setMenuFontTo: font. Preferences setCodeFontTo: codeFont. Preferences setButtonFontTo: font. Preferences setSystemFontTo: font. font := LogicalFont familyName: 'DejaVu Serif' pointSize: 11. Preferences setWindowTitleFontTo: font. -- Damien Cassou http://damiencassou.seasidehosting.st

March 12, 2009

Re: [Pharo-project] Fonts working great

by StÃ©phane Ducasse

I don't think that this is the point. Just that like that people can know how to script their environment. stef > On Thu, Mar 12, 2009 at 1:34 PM, StÃ©phane Ducasse > <stephane.ducasse(a)inria.fr> wrote: >> may be we should start to add such nice snippets on the wiki :) > > Unnecessary because Pharo will come with a great font included. > > -- > Damien Cassou > http://damiencassou.seasidehosting.st > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >

March 12, 2009

Re: [Pharo-project] cant squeak map

by GÃ¶ran Krampe

Hi! StÃ©phane Ducasse wrote: >> Hi! >> >> (being the creator of SM I can't resist this thread on Pharo-list...) >> >> Yes, I am cross-posting, so sue me. > > No we are not like that :) Goodie. :) >> The above is not really a problem with SM "as a tool" but with the >> contents of SM. > > Indeed. > >> And as I predicted a few years back, SS (Squeaksource) >> and PU (package universes) are indeed competing with SM and would >> (as it >> did) cause us to get a fragmentation. I am not blaiming anyone, but >> I do >> see that as the primary cause of "data rot". >> >> Since a lot of projects use SCM hosting as available on SS they don't >> bother taking the extra step in keeping entries at SM fresh. > > Come on. The publish was broken for years. Yes, broken in SS, not in SM AFAIK. Which indeed made it hard to keep entries in SM fresh, I have never looked into it because I haven't had that itch myself. [SNIP] >> And why do you think "cleaning it" would solve something? I am not >> saying that cleaning >> is not needed - just saying that cleaning is not solving the real >> problem. We can't seriously tell people to maintain their packages >> in 3 >> different places (SS, PU, SM) IMHO. >> >> I am interested in creating a new SM3 that can replace both PU and SM >> and that plays very well with SS installations (there are more than >> one >> even though squeaksource.com is the most important one) and can use >> Deltastreams. By "replace" I mean that SM3 of course should simply >> replace current SM but also that it could possibly "auto mirror" >> packages from SS installations making them available on SM3 *without >> any >> extra effort at all*. > > I think that the key point is that somebody is responsible for > publishing package in > a public ready to use Universe/Version I think it boils down to three different aspects/use cases: - Making versions/projects available in a single nice catalog (SM, SS) - Making controlled releases for a set of loosely defined environments (SM) - Making controlled releases for a specific environment (PU) The first is in its simplest form just access to an MC repo. Or just access to code in some other form on SM - load it at your own peril. The second is slightly more defined, since SM doesn't automatically expose "all versions" but only those that you specifically put there, in combination with categorization for Squeak version etc - it is not as "wild" as SS is. The third is hard core controlled - a specific version ONLY for a specific image. Including dependencies etc. regards, GÃ¶ran

March 12, 2009

Re: [Pharo-project] Fonts working great

by Damien Cassou

On Thu, Mar 12, 2009 at 1:34 PM, StÃ©phane Ducasse <stephane.ducasse(a)inria.fr> wrote: > may be we should start to add such nice snippets on the wiki :) Unnecessary because Pharo will come with a great font included. -- Damien Cassou http://damiencassou.seasidehosting.st

March 12, 2009

Re: [Pharo-project] Blocked while merging

by StÃ©phane Ducasse

Apparently with your fix I could merge. I will retry to be sure. On Mar 12, 2009, at 11:10 AM, Gary Chambers wrote: > Hi Stef. > For the old MC browser the revertSelection option doesn't have the > code to > do the option, seems to be present in 3.10 images though... I don't > get a > DNU for the diff option. > > As for the Polymorph tool, it looks like there can be cases where > there is a > conflict with a deletion present in the incoming version of the merge. > > Try replacing PSMCMergePatchMorph>>selectNextConflict with: > > selectNextConflict > "Select the next conflict after the current selection, if any." > > |next def| > next := self nextConflict ifNil: [^self]. > def := next remoteDefinition ifNil: [next localDefinition]. > self changed: {#changes. #openPath. next targetClassName asString. def > selector asString} > > And, if that works in your case I'll version up the change and put on > SqueakSource. > > None of these issues should actually prevent you from merging, as such > though. > > Regards, Gary > > ----- Original Message ----- > From: "StÃ©phane Ducasse" <stephane.ducasse(a)inria.fr> > To: <Pharo-project(a)lists.gforge.inria.fr> > Sent: Tuesday, March 10, 2009 10:22 AM > Subject: Re: [Pharo-project] Blocked while merging > > > Hi all > > did you see this mail > because I'm really blocked and cannot merge anymore in pharo. > > Stef > On Mar 9, 2009, at 1:56 PM, StÃ©phane Ducasse wrote: > >> Hi all >> >> I wanted to merge and I tried with the new Diff tools and I got a >> selector DNU, >> so I switched back to the old merge tool but I got the following bugs >> >> - click on an item >> bring the menu revertSelection -> DNU >> diff -> DNU >> install crahsed. >> >> Does anybody get the same, I'm using pharo 10248 >> >> Stef >> >> >> _______________________________________________ >> Pharo-project mailing list >> Pharo-project(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > > > _______________________________________________ > Pharo-project mailing list > Pharo-project(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >

March 12, 2009