b.c.HandledConflict(Conflict) : class documentation

Part of bzrlib.conflicts View In Hierarchy

Known subclasses: bzrlib.conflicts.DeletingParent, bzrlib.conflicts.HandledPathConflict, bzrlib.conflicts.MissingParent, bzrlib.conflicts.NonDirectoryParent, bzrlib.conflicts.UnversionedParent

A path problem that has been provisionally resolved. This is intended to be a base class.
Method __init__ Undocumented
Method as_stanza Undocumented
Method associated_filenames The names of the files generated to help resolve the conflict.
Method _cmp_list Undocumented

Inherited from Conflict:

Method __cmp__ Undocumented
Method __hash__ Undocumented
Method __eq__ Undocumented
Method __ne__ Undocumented
Method __unicode__ Undocumented
Method __repr__ Undocumented
Static Method factory Undocumented
Static Method sort_key Undocumented
Method cleanup Undocumented
Method action_done Mark the conflict as solved once it has been handled.
Method action_take_this Undocumented
Method action_take_other Undocumented
Method _do Apply the specified action to the conflict.
Method _resolve_with_cleanups Undocumented
def __init__(self, action, path, file_id=None):
Undocumented
def _cmp_list(self):
Undocumented
def as_stanza(self):
Undocumented
def associated_filenames(self):
The names of the files generated to help resolve the conflict.
API Documentation for Bazaar, generated by pydoctor at 2019-12-08 00:44:01.