b.c.PathConflict(Conflict) : class documentation

Part of bzrlib.conflicts View In Hierarchy

Known subclasses: bzrlib.conflicts.ContentsConflict

A conflict was encountered merging file paths
Method __init__ Undocumented
Method as_stanza Undocumented
Method associated_filenames The names of the files generated to help resolve the conflict.
Method action_take_this Undocumented
Method action_take_other Undocumented
Method _resolve Resolve the conflict.
Method _revision_tree Undocumented
Method _infer_file_id 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 _cmp_list Undocumented
Method _do Apply the specified action to the conflict.
Method _resolve_with_cleanups Undocumented
def __init__(self, path, conflict_path=None, file_id=None):
overrides bzrlib.conflicts.Conflict.__init__
Undocumented
def as_stanza(self):
overrides bzrlib.conflicts.Conflict.as_stanza
Undocumented
def associated_filenames(self):
overrides bzrlib.conflicts.Conflict.associated_filenames
overridden in bzrlib.conflicts.ContentsConflict
The names of the files generated to help resolve the conflict.
def _resolve(self, tt, file_id, path, winner):
overridden in bzrlib.conflicts.ContentsConflict
Resolve the conflict.
ParametersttThe TreeTransform where the conflict is resolved.
file_idThe retained file id.
pathThe retained path.
winner'this' or 'other' indicates which side is the winner.
def _revision_tree(self, tree, revid):
Undocumented
def _infer_file_id(self, tree):
Undocumented
def action_take_this(self, tree):
overrides bzrlib.conflicts.Conflict.action_take_this
overridden in bzrlib.conflicts.ContentsConflict
Undocumented
def action_take_other(self, tree):
overrides bzrlib.conflicts.Conflict.action_take_other
overridden in bzrlib.conflicts.ContentsConflict
Undocumented
API Documentation for Bazaar, generated by pydoctor at 2022-06-16 00:25:16.