Why merge so many times?

Levente

On Mon, 29 Aug 2016, commits at source.squeak.org wrote:

> Tim Felgentreff uploaded a new version of Collections to project The Trunk:
> http://source.squeak.org/trunk/Collections-tfel.703.mcz
>
> ==================== Summary ====================
>
> Name: Collections-tfel.703
> Author: tfel
> Time: 2 August 2016, 9:55:19.046368 am
> UUID: 7793774a-ac8e-cb45-b4bc-92b88b4cb50e
> Ancestors: Collections-mt.702, Collections-kfr.9
>
> merge from Squeakland Etoys image
>
> =============== Diff against Collections-mt.702 ===============
>
> Item was changed:
>  ----- Method: String>>< (in category 'comparing') -----
>  < aString
>  	"Answer whether the receiver sorts before aString.
>  	The collation order is simple ascii (with case differences)."
> + 	^(self compare: aString caseSensitive: true) = 1!
> -
> - 	^ (self compare: self with: aString collated: AsciiOrder) = 1!
>
> Item was changed:
>  ----- Method: String>><= (in category 'comparing') -----
>  <= aString
>  	"Answer whether the receiver sorts before or equal to aString.
>  	The collation order is simple ascii (with case differences)."
> + 	^(self compare: aString caseSensitive: true) <= 2!
> -
> - 	^ (self compare: self with: aString collated: AsciiOrder) <= 2!
>
> Item was changed:
>  ----- Method: String>>> (in category 'comparing') -----
>  > aString
>  	"Answer whether the receiver sorts after aString.
>  	The collation order is simple ascii (with case differences)."
> + 	^(self compare: aString caseSensitive: true) = 3!
> -
> - 	^ (self compare: self with: aString collated: AsciiOrder) = 3!
>
> Item was changed:
>  ----- Method: String>>>= (in category 'comparing') -----
>  >= aString
>  	"Answer whether the receiver sorts after or equal to aString.
>  	The collation order is simple ascii (with case differences)."
> + 	^(self compare: aString caseSensitive: true) >= 2!
> -
> - 	^ (self compare: self with: aString collated: AsciiOrder) >= 2!
>
> Item was changed:
>  ----- Method: TranscriptStream class>>registerInFlapsRegistry (in category 'class initialization') -----
>  registerInFlapsRegistry
>  	"Register the receiver in the system's flaps registry"
>  	self environment
>  		at: #Flaps
> + 		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}
> - 		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.')
>  						forFlapNamed: 'Tools']
>  !
>
> Item was changed:
>  ----- Method: WriteStream>>nextPut: (in category 'accessing') -----
>  nextPut: anObject
>  	"Primitive. Insert the argument at the next position in the Stream
>  	represented by the receiver. Fail if the collection of this stream is not an
>  	Array or a String. Fail if the stream is positioned at its end, or if the
>  	position is out of bounds in the collection. Fail if the argument is not
>  	of the right type for the collection. Optional. See Object documentation
>  	whatIsAPrimitive."
>
>  	<primitive: 66>
> + 	((collection class == ByteString) and: [
> + 		anObject isCharacter and:[anObject isOctetCharacter not]]) ifTrue: [
> + 			collection _ (WideString from: collection).
> + 			^self nextPut: anObject.
> + 	].
>  	position >= writeLimit
>  		ifTrue: [^ self pastEndPut: anObject]
>  		ifFalse:
> + 			[position _ position + 1.
> - 			[position := position + 1.
>  			^collection at: position put: anObject]!
>
>
>