<div dir="ltr">Because these versions were done over the course of the last weeks, and I merged trunk into my image on a regular basis, since it was moving fairly quickly prior to release.</div><br><div class="gmail_quote"><div dir="ltr">On Tue, 30 Aug 2016 at 22:45 Levente Uzonyi <<a href="mailto:leves@caesar.elte.hu">leves@caesar.elte.hu</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Why merge so many times?<br>
<br>
Levente<br>
<br>
On Mon, 29 Aug 2016, <a href="mailto:commits@source.squeak.org" target="_blank">commits@source.squeak.org</a> wrote:<br>
<br>
> Tim Felgentreff uploaded a new version of Collections to project The Trunk:<br>
> <a href="http://source.squeak.org/trunk/Collections-tfel.703.mcz" rel="noreferrer" target="_blank">http://source.squeak.org/trunk/Collections-tfel.703.mcz</a><br>
><br>
> ==================== Summary ====================<br>
><br>
> Name: Collections-tfel.703<br>
> Author: tfel<br>
> Time: 2 August 2016, 9:55:19.046368 am<br>
> UUID: 7793774a-ac8e-cb45-b4bc-92b88b4cb50e<br>
> Ancestors: Collections-mt.702, Collections-kfr.9<br>
><br>
> merge from Squeakland Etoys image<br>
><br>
> =============== Diff against Collections-mt.702 ===============<br>
><br>
> Item was changed:<br>
> ----- Method: String>>< (in category 'comparing') -----<br>
> < aString<br>
> "Answer whether the receiver sorts before aString.<br>
> The collation order is simple ascii (with case differences)."<br>
> + ^(self compare: aString caseSensitive: true) = 1!<br>
> -<br>
> - ^ (self compare: self with: aString collated: AsciiOrder) = 1!<br>
><br>
> Item was changed:<br>
> ----- Method: String>><= (in category 'comparing') -----<br>
> <= aString<br>
> "Answer whether the receiver sorts before or equal to aString.<br>
> The collation order is simple ascii (with case differences)."<br>
> + ^(self compare: aString caseSensitive: true) <= 2!<br>
> -<br>
> - ^ (self compare: self with: aString collated: AsciiOrder) <= 2!<br>
><br>
> Item was changed:<br>
> ----- Method: String>>> (in category 'comparing') -----<br>
> > aString<br>
> "Answer whether the receiver sorts after aString.<br>
> The collation order is simple ascii (with case differences)."<br>
> + ^(self compare: aString caseSensitive: true) = 3!<br>
> -<br>
> - ^ (self compare: self with: aString collated: AsciiOrder) = 3!<br>
><br>
> Item was changed:<br>
> ----- Method: String>>>= (in category 'comparing') -----<br>
> >= aString<br>
> "Answer whether the receiver sorts after or equal to aString.<br>
> The collation order is simple ascii (with case differences)."<br>
> + ^(self compare: aString caseSensitive: true) >= 2!<br>
> -<br>
> - ^ (self compare: self with: aString collated: AsciiOrder) >= 2!<br>
><br>
> Item was changed:<br>
> ----- Method: TranscriptStream class>>registerInFlapsRegistry (in category 'class initialization') -----<br>
> registerInFlapsRegistry<br>
> "Register the receiver in the system's flaps registry"<br>
> self environment<br>
> at: #Flaps<br>
> + ifPresent: [:cl | cl registerQuad: {#TranscriptStream. #openMorphicTranscript. 'Transcript' translatedNoop. 'A Transcript is a window usable for logging and debugging; browse references to #Transcript for examples of how to write to it.' translatedNoop}<br>
> - ifPresent: [:cl | cl registerQuad: #(TranscriptStream openMorphicTranscript 'Transcript' 'A Transcript is a window usable for logging and debugging; browse references to #Transcript for examples of how to write to it.')<br>
> forFlapNamed: 'Tools']<br>
> !<br>
><br>
> Item was changed:<br>
> ----- Method: WriteStream>>nextPut: (in category 'accessing') -----<br>
> nextPut: anObject<br>
> "Primitive. Insert the argument at the next position in the Stream<br>
> represented by the receiver. Fail if the collection of this stream is not an<br>
> Array or a String. Fail if the stream is positioned at its end, or if the<br>
> position is out of bounds in the collection. Fail if the argument is not<br>
> of the right type for the collection. Optional. See Object documentation<br>
> whatIsAPrimitive."<br>
><br>
> <primitive: 66><br>
> + ((collection class == ByteString) and: [<br>
> + anObject isCharacter and:[anObject isOctetCharacter not]]) ifTrue: [<br>
> + collection _ (WideString from: collection).<br>
> + ^self nextPut: anObject.<br>
> + ].<br>
> position >= writeLimit<br>
> ifTrue: [^ self pastEndPut: anObject]<br>
> ifFalse:<br>
> + [position _ position + 1.<br>
> - [position := position + 1.<br>
> ^collection at: position put: anObject]!<br>
><br>
><br>
><br>
<br>
</blockquote></div>