Class: Diff3ExclusiveVisitor

• Inheritance
• Description
• Instance protocol
  • as yet unclassified

Inheritance:

   Object
   |
   +--Diff3InclusiveVisitor
      |
      +--Diff3ExclusiveVisitor

Package:

stx:libtool

Category:

Collections-Sequenceable-Diff

Version:

rev: 1.3 date: 2021/01/20 14:07:53

user: cg

file: Diff3ExclusiveVisitor.st directory: libtool

module: stx stc-classLibrary: libtool

Description:

A Diff3ExclusiveVisitor is used by Diff3 to construct a three-way SequenceableCollection 
merge that resolves 'false conflicts' (a.k.a 'accidental clean merges') by accepting the 
changed text as a non-conflict in the merge result.


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

 isTrueConflictBetween: left and: right

A conflict is 'false' when, from a particular ancestral snippet, both the left and right branches have changed to have the same contents. In some circumstances this can be treated as a clean merge; in others, it's actually an exception that needs to be dealt with. See http://revctrl.org/AccidentalCleanMerge.

 left: left original: original right: right