[FIX][KCP][3.6a] IfUnhandledError-nk ( conflicts )

denker at iam.unibe.ch denker at iam.unibe.ch
Fri Oct 29 14:07:36 CEST 2004




Checking IfUnhandledError-nk.cs (#5278) for method conflicts with
changesets after 5278FileListDnD-nk ...
...checking Scanner>>xDigit
CONFLICT found for IRCMorph class>>sendCommand:... class IRCMorph does
not exist in the image and is not defined in the file
...checking StringSocket>>transmitQueueNext
...checking SyntaxMorph>>try
...checking Object>>closeTo:
...checking Object>>nameForViewer
...checking Transcripter>>readEvalPrint
...checking UUIDGenerator>>makeSeedFromSound
CONFLICT found for UUIDGenerator class>>makeSeedFromSound with newer
changeset 5747SoundSystemCleanup-gk
...checking Float>>closeTo:
...checking Color class>>fromString:
...checking PluggableTextMorph>>accept
CONFLICT found for PluggableTextMorph class>>accept with newer
changesets 5546CompleteTranslation37-dgd 5613doIfNotNilDeprecation-md
6224ExtensionsForShout-tween
...checking MethodFinder>>testPerfect:
...checking Preferences class>>storePreferencesToDisk
...checking Preferences class>>restorePreferencesFromDisk
...checking PasteUpMorph>>setGridSpec
CONFLICT found for PasteUpMorph class>>setGridSpec with newer changesets
5546CompleteTranslation37-dgd 6305GriddingAndGraphFix
...checking SystemVersion class>>parseVersionString:
...checking ArchiveViewer>>extractAll
CONFLICT found for ArchiveViewer class>>extractAll with newer changeset
5687ZipArchiveExtractAll
...checking ArchiveViewer>>saveArchive
...checking ArchiveViewer>>writePrependingFile
...checking Debugger>>selectedMessage
CONFLICT found for Debugger class>>selectedMessage with newer changesets
5308ContextEnh-ajh 5734DebuggerHighlightFix-nk
...checking ProcessBrowser>>pcRange
CONFLICT found for ProcessBrowser class>>pcRange with newer changeset
5345DeadProcessFix-nk
...checking ProcessBrowser>>selectedMethod
...checking ProcessBrowser class>>suspendProcess:
...checking ProcessBrowser class>>nameAndRulesFor:
CONFLICT found for ProcessBrowser>>nameAndRulesFor: with newer
changesets 5381ProcessBrowserDepFix-nk 5574ProcessBrwsDeadProc-nk
5784NoEventSensorProcess-ar 5900MoreEventSensorFixes-nk
...checking MPEGFile>>audioChannels:
...checking MPEGFile>>videoFrameWidth:
...checking MPEGFile>>audioReadBuffer:stream:channel:
...checking MPEGFile>>audioSetSample:stream:
...checking MPEGFile>>audioReReadBuffer:stream:channel:samples:
...checking MPEGFile>>videoFrameRate:
...checking MPEGFile>>audioSampleRate:
...checking MPEGFile>>videoDropFrames:stream:
...checking MPEGFile>>audioReadBuffer:stream:channel:samples:
...checking MPEGFile>>videoPreviousFrame:
...checking MPEGFile>>audioGetSample:
...checking MPEGFile>>audioReReadBuffer:stream:channel:
...checking
MPEGFile>>videoReadNextFrameInto:x:y:width:height:outWidth:outHeight:col
orModel:stream:bytesPerRow:
...checking MPEGFile>>videoSetFrame:stream:
...checking MPEGFile>>videoGetFrame:
...checking MPEGFile>>audioSamples:
...checking MPEGFile>>videoFrameHeight:
CONFLICT found for CRDisplayPropertiesMorph class>>aspectRatio:... class
CRDisplayPropertiesMorph does not exist in the image and is not defined
in the file
...checking CompiledMethod>>dateMethodLastSubmitted
...checking BMPReadWriter class>>readAllFrom:
...checking BMPReadWriter class>>displayAllFrom:
...checking EToyCommunicatorMorph class>>instanceReport
...checking ComplexProgressIndicator>>backgroundWorldDisplay
CONFLICT found for ComplexProgressIndicator
class>>backgroundWorldDisplay with newer changeset 5499KCP83NewBeepENGV2
...checking Inspector>>selectionPrintString
CONFLICT found for Inspector class>>selectionPrintString with newer
changeset 6219InspectorFixes
...checking Number>>closeTo:
...checking TelnetProtocolClient>>determineResponseCode
...checking ZASMStepsMorph>>getStepCount
...checking ContextPart>>printDetails:
...checking ContextPart class>>carefullyPrint:on:
...checking Utilities class>>serverUrls
CONFLICT found for Utilities>>serverUrls with newer changeset
5361DeadServerFix-nk
...checking PolygonMorph>>specifyDashedLine
CONFLICT found for IRCConnection class>>sendRawCommand:... class
IRCConnection does not exist in the image and is not defined in the file
...checking OldSocket class>>initializeNetworkIfFail:
...checking WeakRegistry>>protected:
...checking TextMorph>>getNumericValue
...checking EToyPeerToPeer>>doReceiveData
...checking WorldState>>displayWorldSafely:
CONFLICT found for WorldState class>>displayWorldSafely: with newer
changeset 5308ContextEnh-ajh
...checking WorldState>>runLocalStepMethodsIn:
CONFLICT found for XMLTokenizer class>>nextCharReference... class
XMLTokenizer does not exist in the image and is not defined in the file
...checking AbstractLauncher>>numericParameterAtOneOf:ifAbsent:
...checking Semaphore>>critical:ifError:
...checking BlockContext>>ifError:
CONFLICT found for BlockContext class>>ifError: with newer changeset
5308ContextEnh-ajh
...checking Form>>readNativeResourceFrom:
...checking PNGReadWriter class>>createAFormFrom:
CONFLICT found for CRDisplayPropertiesInstanceBrowser
class>>save:on:named:... class CRDisplayPropertiesInstanceBrowser does
not exist in the image and is not defined in the file
CONFLICT found for CRDisplayPropertiesInstanceBrowser
class>>checkFilenameAndSave:toFileNamed:overwrite:... class
CRDisplayPropertiesInstanceBrowser does not exist in the image and is
not defined in the file
CONFLICT found for CRDisplayPropertiesInstanceBrowser
class>>loadFromFileNamed:... class CRDisplayPropertiesInstanceBrowser
does not exist in the image and is not defined in the file
...checking EToySenderMorph>>startNebraskaClient
...checking WeakArray class>>addWeakDependent:
...checking WeakArray class>>finalizationProcess
...checking WeakArray class>>removeWeakDependent:
...checking MailMessage>>time
...checking MailMessage>>selfTest
...checking CommandHistory class>>forgetAllGrabCommandsFrom:
...checking ServerDirectory>>exists
CONFLICT found for ServerDirectory class>>exists with newer changeset
5603serverFixes-mir
...checking ServerDirectory>>putFile:named:retry:
CONFLICT found for ServerDirectory class>>putFile:named:retry: with
newer changeset 6097-0273isStringFixes-nk
...checking ServerDirectory class>>fetchExternalSettingsIn:
...checking ServerDirectory class>>parseEToyUserListFrom:
...checking ObjectExplorerWrapper>>asString
...checking ImageSegment>>copyFromRoots:sizeHint:areUnique:
...checking MethodContext>>printDetails:
...checking PowerManagement class>>startUp
...checking POP3Client>>messageCount
...checking MPEGPlayer>>external
...checking MPEGPlayer>>privatePlayAudioStream:
21 conflicts found.


More information about the Squeak-harvest mailing list