In Polymorph-Tools-Diff-gvc.14 Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <[email protected]> To: <[email protected]> Sent: Friday, March 13, 2009 3:26 PM Subject: Re: [Pharo-project] Blocked while merging so should I add it or you integrate it and I push it into the stream? Stef On Mar 13, 2009, at 3:42 PM, Stéphane Ducasse wrote: > I redid everything and apparently everything is working with your fix. > Thanks > > On Mar 12, 2009, at 3:44 PM, Gary Chambers wrote: > >> What is "blocking" you exactly? >> >> Regards, Gary >> >> ----- Original Message ----- >> From: "Stéphane Ducasse" <[email protected]> >> To: <[email protected]> >> 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" <[email protected]> >>>> To: <[email protected]> >>>> 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 >>>>> [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
