eXept Software AG Logo

Smalltalk/X Webserver

Documentation of class 'Diff3InclusiveVisitor':

Home

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

Class: Diff3InclusiveVisitor


Inheritance:

   Object
   |
   +--Diff3InclusiveVisitor
      |
      +--Diff3ExclusiveVisitor

Package:
stx:libtool
Category:
Collections-Sequenceable-Diff
Version:
rev: 1.2 date: 2014/02/25 07:00:21
user: cg
file: Diff3InclusiveVisitor.st directory: libtool
module: stx stc-classLibrary: libtool
Author:
Tony Garnock-Jones <tonyg@lshift.com>

Description:


A Diff3InclusiveVisitor is used by Diff3 to construct a three-way SequenceableCollection merge that treats 'false conflicts' 
(a.k.a 'accidental clean merges') as true conflicts.

Instance Variables
    files:          Used to extract the elements for each part of the result
    okLines:                Used to buffer up lists of non-conflicting elements
    result:                 Accumulator


[instance variables:]

[class variables:]


Related information:



Class protocol:

instance creation
o  new
return an initialized instance


Instance protocol:

as yet unclassified
o  files: aDictionary

o  flushOk

o  initialize

o  left: left original: original right: right

o  result

o  side: aSelector chunk: aChunk



ST/X 7.1.0.0; WebServer 1.663 at exept.de:8081; Sun, 22 Jul 2018 03:14:21 GMT