Class: Diff3

• Inheritance
• Description
• Related information
• Instance protocol
  • accessing
  • merging
  • private
• Private classes

Inheritance:

   Object
   |
   +--Diff3

Package:

stx:libtool

Category:

Collections-Sequenceable-Diff

Version:

rev: 1.4 date: 2016/10/13 23:23:39

user: cg

file: Diff3.st directory: libtool

module: stx stc-classLibrary: libtool

Author:

Tony Garnock-Jones <tonyg@lshift.com>

Description:

Diff3 provides a three-way-merge algorithm suitable for performing textual merges, 
such as are often required as part of source-code version control systems.

Instance Variables
    diffClass:      <Class> Should be a subclass of GenericDiff. Used to resolve changes.
    file0:          <SequenceableCollection> The ancestral file.
    file1:          <SequenceableCollection> The left branch.
    file2:          <SequenceableCollection> The right branch.


[instance variables:]

[class variables:]

Related information:

Instance protocol:

 diffClass

Modified (format): / 16-03-2012 / 20:27:28 / Jan Vrany <jan.vrany@fit.cvut.cz>

 diffClass: anObject

 file0

 file0: anObject

 file1

 file1: anObject

 file2

 file2: anObject

 fileAt: side

Given a side (#left, #original or #right), returns the
corresponding file

 diffIndices

Returns an Array of Diff3Chunks (representing clean merges) or Diff3Conflicts
(containing DiffChunks, representing conflicts), together representing the
results of a three-way merge between file1/file0/file2. Does not detect
'false conflicts', and can return two Diff3Chunks next to each other in
the result.

 merge

Returns an Array of (#ok -> {...}) or (#conflict -> Diff3Conflict
of collections) instances representing the results of a three-way
merge between file1/file0/file2. Does not optimistically treat
'false conflicts' as clean merges (see the class comment for
Diff3InclusiveVisitor).

 mergeClean

Returns an Array of (#ok -> {...}) or (#conflict -> Diff3Conflict of
collections) instances representing the results of a three-way merge
between file1/file0/file2. Optimistically treats 'false conflicts'
as clean merges (see the class comment for Diff3ExclusiveVisitor).

 mergeIndices

Returns an Array of Diff3Chunks (representing clean merges) or Diff3Conflicts
(containing DiffChunks, representing conflicts), together representing the
results of a three-way merge between file1/file0/file2. Does not detect
'false conflicts', and can return two Diff3Chunks next to each other in
the result.

 mergeIndicesDiscardEmpty: discardEmpty

Returns an Array of Diff3Chunks (representing clean merges) or Diff3Conflicts
(containing DiffChunks, representing conflicts), together representing the
results of a three-way merge between file1/file0/file2. Does not detect
'false conflicts', and can return two Diff3Chunks next to each other in
the result.

If discard empty is true, empty clean merge chunks are not included

 addCommonChunkTo: result between: commonOffset and: targetOffset

 computeConflictChunk: side fromCleanMerge: hunk old: old new: new into: conflict

Hmm....we have to compare

 computeConflictFrom: i1 to: i2 hunks: hunks

 computeConflictFromCleanMerge: hunk

 computeHunks

 fileMap

 findOverlapStartingAt: startIndex in: hunks

Modified (format): / 20-03-2012 / 18:04:47 / Jan Vrany <jan.vrany@fit.cvut.cz>

 merge: excludeFalseConflicts

Private classes:

    Chunk
    Conflict