[FIX][ENH] FileListUpdateFix-nk ( conflicts )

denker at iam.unibe.ch denker at iam.unibe.ch
Fri Oct 29 12:04:26 CEST 2004


Checking FileListUpdateFix-nk.cs (#5278) for method conflicts with
changesets after 5278FileListDnD-nk ...
...checking FileList2>>morphicPatternPane
CONFLICT found for FileList2 class>>defaultBackgroundColor with newer
changeset 5292FileList2-color-dgd
...checking FileModifyingSimpleServiceEntry>>performServiceFor:
...checking FileList>>noFileSelectedMenu:
...checking FileList>>update:
...checking FileList>>fullFileListMenu:shifted:
CONFLICT found for FileList class>>fullFileListMenu:shifted: with newer
changesets 5495FileListCleanup-nk 5629mvcFileListMore-asm
5947FileListFileOpenFix-nk
...checking FileList>>pattern:
CONFLICT found for FileList class>>itemsForFileEnding: with newer
changeset 5495FileListCleanup-nk
...checking FileList>>updateFileList
CONFLICT found for FileList class>>updateFileList with newer changeset
5278FileListDnD-nk
...checking FileList>>fileContentsMenu:shifted:
CONFLICT found for FileList class>>fileContentsMenu:shifted: with newer
changesets 5546CompleteTranslation37-dgd 5994-004-systemMod
5996-006-incChanges 6008-1012FileOutEncoding
...checking FileList class>>open
...checking FileList class>>openAsMorph
...checking FileList
class>>addVolumesAndPatternPanesTo:at:plus:forFileList:
CONFLICT found for
FileList>>addVolumesAndPatternPanesTo:at:plus:forFileList: with newer
changesets 5278FileListDnD-nk 5913DeprecatedScrollMsgs-nk
6 conflicts found.


More information about the Squeak-harvest mailing list