b.c.ContentsConflict(PathConflict) : class documentation

Part of bzrlib.conflicts View In Hierarchy

The files are of different types (or both binary), or not present
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.

Inherited from PathConflict:

Method __init__ Undocumented
Method as_stanza Undocumented
Method _revision_tree Undocumented
Method _infer_file_id Undocumented

Inherited from Conflict (via PathConflict):

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 associated_filenames(self):
The names of the files generated to help resolve the conflict.
def _resolve(self, tt, suffix_to_remove):
Resolve the conflict.

The resolution is symmetric: when taking THIS, OTHER is deleted and item.THIS is renamed into item and vice-versa.

ParametersttThe TreeTransform where the conflict is resolved.
suffix_to_removeEither 'THIS' or 'OTHER'
def action_take_this(self, tree):
Undocumented
def action_take_other(self, tree):
Undocumented
API Documentation for Bazaar, generated by pydoctor at 2021-10-24 00:21:41.