eXept Software AG Logo

Smalltalk/X Webserver

Documentation of class 'Diff3::Conflict':

Home

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

Class: Conflict (private in Diff3

This class is only visible from within Diff3.

Inheritance:

   Object
   |
   +--Diff3::Conflict

Package:
stx:libtool
Category:
Collections-Sequenceable-Diff
Owner:
Diff3
Author:
Tony Garnock-Jones <tonyg@lshift.com>

Description:


A Diff3Conflict represents a merge conflict.

Instance Variables
    left:           Either a SequenceableCollection or a Diff3Chunk representing the left variant.
    original:       Either a SequenceableCollection or a Diff3Chunk representing the original variant.
    right:          Either a SequenceableCollection or a Diff3Chunk representing the right variant.


[instance variables:]

[class variables:]


Related information:



Instance protocol:

accessing
o  at: side
Given a side (#left, #original or #right), returns the
corresponding chunk

o  at: side put: chunk
Given a side (#left, #original or #right), sets the
corresponding chunk

o  left

o  left: anObject

o  leftAt: index

o  length

o  original

o  original: anObject

o  originalAt: index

o  right

o  right: anObject

o  rightAt: index

as yet unclassified
o  = otherConflict
(comment from inherited method)
return true if the receiver and the arg have the same structure.
Notice:
This method is partially open coded (inlined) by the compiler(s)
identical objects are always considered equal.
redefining it may not work as expected.

o  accept: aVisitor

o  printOn: aStream

testing
o  isChunk

o  isConflict

o  isInsertionInLeft

o  isInsertionInOriginal

o  isInsertionInRight



ST/X 7.2.0.0; WebServer 1.670 at bd0aa1f87cdd.unknown:8081; Wed, 17 Aug 2022 23:36:26 GMT