There is a single "conflict". Right click a tree arrow and scroll (will eventual add a "next conflict" option).
Select, pop the menu and choose "Use incoming version". Regards, Gary. ----- Original Message ----- From: "Stéphane Ducasse" <[email protected]> To: <[email protected]> Sent: Tuesday, January 20, 2009 2:25 PM Subject: Re: [Pharo-project] uiTheme Standard Squeak uses ~96% CPU Ok gary using the latest diff (as in latest pharo) this is strange because I cannot press the merge button. stef On Jan 20, 2009, at 3:05 PM, Gary Chambers wrote: > Just ignore... for Squeak... > > Regards, Gary. > > ----- Original Message ----- > From: "Stéphane Ducasse" <[email protected]> > To: <[email protected]> > Sent: Tuesday, January 20, 2009 2:00 PM > Subject: Re: [Pharo-project] uiTheme Standard Squeak uses ~96% CPU > > > Gary there is a FileList2 getting in my way.... :) > > On Jan 20, 2009, at 1:32 PM, Stéphane Ducasse wrote: > >> excellent I will do an update >> >> stef >> On Jan 20, 2009, at 12:56 PM, Gary Chambers wrote: >> >>> An erroneous "self changed" was being performed when the splitter >>> should >>> not be drawn (not needed since transparent with no handles). >>> >>> Fixed in Polymorph-Widgets-gvc.29. >>> >>> Regards, Gary. >>> >>> ----- Original Message ----- >>> From: "Gary Chambers" <[email protected]> >>> To: <[email protected]> >>> Sent: Tuesday, January 20, 2009 11:42 AM >>> Subject: Re: [Pharo-project] uiTheme Standard Squeak uses ~96% CPU >>> >>> >>> It appears to be the case that for StandardSqueak the pane splitters >>> are >>> constantly showing damage and, hence, being redrawn... >>> >>> Regards, Gary. >>> >>> ----- Original Message ----- >>> From: "Gary Chambers" <[email protected]> >>> To: <[email protected]> >>> Sent: Tuesday, January 20, 2009 11:31 AM >>> Subject: Re: [Pharo-project] uiTheme Standard Squeak uses ~96% CPU >>> >>> >>> Confirmed and investigating... >>> >>> Regards, Gary. >>> >>> ----- Original Message ----- >>> From: "Stéphane Ducasse" <[email protected]> >>> To: "Pharo Development" <[email protected]> >>> Sent: Tuesday, January 20, 2009 8:31 AM >>> Subject: [Pharo-project] uiTheme Standard Squeak uses ~96% CPU >>> >>> >>> http://code.google.com/p/pharo/issues/detail?id=454&can=1&colspec=ID%20Type%20Status%20Summary&start=400 >>> >>> Issue 454: >>> uiTheme Standard Squeak uses ~96% CPU >>> ‹ Prev 454 of 454 >>> 1 person starred this issue and may be notified of changes. >>> Back to list >>> Status: >>> New >>> Owner: >>> ---- >>> >>> >>> Add a comment andmake changes below >>> Reported by wsgibson1967, Today (5 hours ago) >>> I know. As much as I really like the Watery 2 uiTheme theme I also >>> really like to use the Standard Squeak theme. I have found on both >>> my >>> Mac and Windows systems that when using the Standard Squeak theme >>> with >>> Pharo (core or dev) that the CPU usage will go very high. If a >>> normal >>> amount of windows are open the CPU usage goes upwards to 96%. I do >>> not >>> get this with the Watery 2 or Soft Squeak themes. In case this is >>> useful, I am using TrueType fonts that are standard to each >>> platform. >>> To reproduce: 1) Change to Standard Squeak theme 2) Open two code >>> browsers and select methods from any class (just opening browsers >>> without drilling down to methods do not produce as much of an >>> effect) >>> 3) Open a Test Runner window 4) Open a Monticello Browser The CPU >>> will >>> increase to roughly 96%. I also would like to mention that you guys >>> have done an INCREDIBLE job with Pharo! I am totally impressed with >>> the amount of work done with Pharo as well as its quality. Thank you >>> for stepping up to the challenge! >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> [email protected] >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> [email protected] >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> [email protected] >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >>> >>> _______________________________________________ >>> Pharo-project mailing list >>> [email protected] >>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >>> >> >> >> _______________________________________________ >> Pharo-project mailing list >> [email protected] >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project >> > > > _______________________________________________ > Pharo-project mailing list > [email protected] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > > > _______________________________________________ > Pharo-project mailing list > [email protected] > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project > _______________________________________________ Pharo-project mailing list [email protected] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list [email protected] http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
