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

Type PatchConflict

  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

Method Summary
  __init__(self, text)
  __str__(self)
tla-style changeset application line.
    Inherited from object
  __delattr__(...)
x.__delattr__('name') <==> del x.name...
  __getattribute__(...)
x.__getattribute__('name') <==> x.name...
  __hash__(x)
x.__hash__() <==> hash(x)...
  __new__(T, S, ...)
T.__new__(S, ...) -> a new object with type S, a subtype of T...
  __reduce__(...)
helper for pickle...
  __reduce_ex__(...)
helper for pickle...
  __repr__(x)
x.__repr__() <==> repr(x)...
  __setattr__(...)
x.__setattr__('name', value) <==> x.name = value...

Property Summary
    Inherited from MergeOutcome
  directory
  name

Method Details

__str__(self)
(Informal representation operator)

tla-style changeset application line.
Overrides:
pybaz.MergeOutcome.__str__ (inherited documentation)

Generated by Epydoc 2.1 on Thu Feb 2 14:21:54 2006 http://epydoc.sf.net