b.c.Conflict(object) : class documentation

Part of bzrlib.conflicts View In Hierarchy

Known subclasses: bzrlib.conflicts.HandledConflict, bzrlib.conflicts.PathConflict, bzrlib.conflicts.TextConflict

Base class for all types of conflict
Method __init__ Undocumented
Method as_stanza Undocumented
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 associated_filenames The names of the files generated to help resolve the conflict.
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 _cmp_list Undocumented
Method _do Apply the specified action to the conflict.
Method _resolve_with_cleanups Undocumented
def __init__(self, path, file_id=None):
Undocumented
def as_stanza(self):
Undocumented
def _cmp_list(self):
Undocumented
def __cmp__(self, other):
Undocumented
def __hash__(self):
Undocumented
def __eq__(self, other):
Undocumented
def __ne__(self, other):
Undocumented
def __unicode__(self):
Undocumented
def __repr__(self):
Undocumented
@staticmethod
def factory(type, **kwargs):
Undocumented
@staticmethod
def sort_key(conflict):
Undocumented
def _do(self, action, tree):
Apply the specified action to the conflict.
ParametersactionThe method name to call.
treeThe tree passed as a parameter to the method.
def associated_filenames(self):
The names of the files generated to help resolve the conflict.
def cleanup(self, tree):
Undocumented
def action_done(self, tree):
Mark the conflict as solved once it has been handled.
def action_take_this(self, tree):
Undocumented
def action_take_other(self, tree):
Undocumented
def _resolve_with_cleanups(self, tree, *args, **kwargs):
Undocumented
API Documentation for Bazaar, generated by pydoctor at 2019-09-18 00:32:59.