Package pybaz :: Class PatchConflict
[frames] | no frames]

Class PatchConflict

source code

  object --+    
           |    
MergeOutcome --+
               |
              PatchConflict

Changeset application summary line for a patch conflict.

:ivar name: name of the file where the patch conflict occurred.
:ivar directory: always False



Instance Methods
 
__init__(self, text)
x.__init__(...) initializes x; see x.__class__.__doc__ for signature
 
__str__(self)
tla-style changeset application line.

Inherited from object: __delattr__, __getattribute__, __hash__, __new__, __reduce__, __reduce_ex__, __repr__, __setattr__

Properties

Inherited from MergeOutcome: directory, name

Inherited from object: __class__

Method Details

__init__(self, text)
(Constructor)

 
x.__init__(...) initializes x; see x.__class__.__doc__ for signature

Overrides: object.__init__
(inherited documentation)

__str__(self)
(Informal representation operator)

 
tla-style changeset application line.

Overrides: MergeOutcome.__str__
(inherited documentation)