Class: Conflict (private in Diff3

• Inheritance
• Description
• Instance protocol
  • accessing
  • as yet unclassified
  • testing

Inheritance:

   Object
   |
   +--Diff3::Conflict

Package:

stx:libtool

Category:

Collections-Sequenceable-Diff

Owner:

Diff3

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:]

copyright
Copyright (c) 2007-2012 Tony Garnock-Jones

This code is based on Squeak's DiffMerge package
written by Tony Garnock-Jones. Original project's web site:

http://www.squeaksource.com/DiffMerge

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the 'Software'), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

Instance protocol:

 at: side

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

 at: side put: chunk

Given a side (#left, #original or #right), sets the
corresponding chunk

 left

 left: anObject

 leftAt: index

 length

 original

 original: anObject

 originalAt: index

 right

 right: anObject

 rightAt: index

 = 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.

 accept: aVisitor

 printOn: aStream

(comment from inherited method)
append a user printed representation of the receiver to aStream.
The format is suitable for a human - not meant to be read back.

The default here is to output the receiver's class name.
BUT: this method is heavily redefined for objects which
can print prettier.

 isChunk

 isConflict

 isInsertionInLeft

 isInsertionInOriginal

 isInsertionInRight