Class: ChangeSetDiffEntry

• Inheritance
• Class protocol
  • image specs
  • instance creation
• Instance protocol
  • accessing
  • enumerating
  • merging
  • private
  • testing

Inheritance:

   Object
   |
   +--ChangeSetDiffComponent
      |
      +--ChangeSetDiffEntry

Package:

stx:libbasic3

Category:

System-Changes-Diff

Version:

rev: 1.8 date: 2018/07/28 08:07:27

user: cg

file: ChangeSetDiffEntry.st directory: libbasic3

module: stx stc-classLibrary: libbasic3

Class protocol:

 iconMinus

 iconPlus

 versionA: versionA

versionB: versionA asAntiChange

 versionA: versionA versionB: versionB

 versionB: versionB

versionA: versionB asAntiChange;

Instance protocol:

 changeClass

 changeSelector

 className

(comment from inherited method)
return the classname of the receiver's class

 mergeInfo

 mergeInfo: aTextMergeInfo

 mergedUsingVersionA

 mergedUsingVersionB

 mergedUsingVersionBase

 name

(comment from inherited method)
raise an error: must be redefined in concrete subclass(es)

 nonMetaClassName

 versionA

 versionA: something

 versionALabel

 versionAText

 versionAorB

 versionB

 versionB: something

 versionBLabel

 versionBText

 versionBase

 versionBase: something

 versionBaseText

 versionMerged

Returns a change representing a merge

 versionMerged: aChange

 versionMergedLabel

 do: aBlock

 automerge

Automerge version methods

 sort: sortBlock

superclass ChangeSetDiffComponent says that I am responsible to implement this method

 isConflict

Return true, if there is a conflict. For simple two-way diff,
conflict is when there are both versionA and versionB and they
differ. For three-way diff/merge, conflict is iff the entry is not
yet merged

 isDiffItem

 isForCopyrightMethod

Returns true, if this is an entry for version method

 isForVersionMethod

Returns true, if this is an entry for version method

 isMerged

(comment from inherited method)
raise an error: must be redefined in concrete subclass(es)