I don't use the polymorph merge tool. As discussed in a previous thread it's very limited for doing serious merging. It's the first thing I turn off in an update. Just hit the merge button.
thanks, Mike On Mon, Oct 19, 2009 at 8:30 PM, Nicolas Cellier <[email protected]> wrote: > See also http://code.google.com/p/pharo/issues/detail?id=1214 > > 2009/10/19 Nicolas Cellier <[email protected]>: >> Don't know... >> Maybe the plan was to move it up in SequenceableCollection, like >> http://bugs.squeak.org/view.php?id=7242 ? >> >> Nicolas >> >> 2009/10/19 Niko Schwarz <[email protected]>: >>> Then, why was sort: yanked from OrderedCollection? I'm confused. >>> >>> On Mon, Oct 19, 2009 at 9:17 PM, Nicolas Cellier >>> <[email protected]> wrote: >>>> Implementation details: #sortBy: is not exactly #sort: >>>> #sort: does a fast inplace sort, when #sortBy: performs useless copy >>>> operations... >>>> >>>> Nicolas >>>> >>>> 2009/10/19 Niko Schwarz <[email protected]>: >>>>> That was me, it comes from Squeak trunk. I didn't test it, because it >>>>> looked so harmless and works in Squeak … I'm sorry. It should be >>>>> "sortBy: rather than sort:" >>>>> >>>>> niko >>>>> >>>>> On Mon, Oct 19, 2009 at 7:06 PM, Michael Roberts <[email protected]> >>>>> wrote: >>>>>> MCMergeBrowser>>merger: >>>>>> conflicts := aMerger conflicts sort: [:a :b | a operation <= b >>>>>> operation]. >>>>>> >>>>>> OrderedCollection dnu sort: >>>>>> >>>>>> introduced I guess >>>>>> >>>>>> http://code.google.com/p/pharo/issues/detail?id=1320 >>>>>> >>>>>> how was this change tested? >>>>>> >>>>>> thanks, >>>>>> Mike >>>>>> >>>>>> On Mon, Oct 19, 2009 at 4:25 PM, Marcus Denker <[email protected]> wrote: >>>>>>> http://gforge.inria.fr/frs/download.php/24363/PharoCore-1.0-10491rc1.zip >>>>>>> >>>>>>> The zip contains a new sources file. >>>>>>> >>>>>>> Marcus >>>>>>> >>>>>>> _______________________________________________ >>>>>>> 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
