eXept Software AG Logo

Smalltalk/X Webserver

Documentation of class 'ChangeSetDiffEntry':

Home

Documentation
www.exept.de
Everywhere
for:
[back]

Class: ChangeSetDiffEntry


Inheritance:

   Object
   |
   +--ChangeSetDiffComponent
      |
      +--ChangeSetDiffEntry

Package:
stx:libbasic3
Category:
System-Changes-Diff
Version:
rev: 1.7 date: 2016/05/09 08:07:43
user: cg
file: ChangeSetDiffEntry.st directory: libbasic3
module: stx stc-classLibrary: libbasic3

Class protocol:

image specs
o  iconMinus

o  iconPlus

instance creation
o  versionA: versionA
versionB: versionA asAntiChange

o  versionA: versionA versionB: versionB

o  versionB: versionB
versionA: versionB asAntiChange;


Instance protocol:

accessing
o  changeClass

o  changeSelector

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

o  mergeInfo

o  mergeInfo: aTextMergeInfo

o  mergedUsingVersionA

o  mergedUsingVersionB

o  mergedUsingVersionBase

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

o  nonMetaClassName

o  versionA

o  versionA: something

o  versionALabel

o  versionAText

o  versionAorB

o  versionB

o  versionB: something

o  versionBLabel

o  versionBText

o  versionBase

o  versionBase: something

o  versionBaseText

o  versionMerged
Returns a change representing a merge

o  versionMerged: aChange

o  versionMergedLabel

enumerating
o  do: aBlock

merging
o  automerge
Automerge version methods

private
o  sort: sortBlock
superclass ChangeSetDiffComponent says that I am responsible to implement this method

testing
o  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

o  isDiffItem

o  isForCopyrightMethod
Returns true, if this is an entry for version method

o  isForVersionMethod
Returns true, if this is an entry for version method

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



ST/X 7.1.0.0; WebServer 1.663 at exept.de:8081; Mon, 19 Nov 2018 00:43:05 GMT