b.c.TextConflict(Conflict) : class documentation

Part of bzrlib.conflicts View In Hierarchy

The merge algorithm could not resolve all differences encountered.
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 by copying one of .THIS or .OTHER into file.

Inherited from 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 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, winner_suffix):
Resolve the conflict by copying one of .THIS or .OTHER into file.

The resolution is symmetric, when taking THIS, item.THIS is renamed into item and vice-versa. This takes one of the files as a whole ignoring every difference that could have been merged cleanly.

ParametersttThe TreeTransform where the conflict is resolved.
winner_suffixEither '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.