Part of bzrlib.conflicts View In Hierarchy
Known subclasses: bzrlib.conflicts.ContentsConflict
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 |
Parameters | tt | The TreeTransform where the conflict is resolved. |
file_id | The retained file id. | |
path | The retained path. | |
winner | 'this' or 'other' indicates which side is the winner. |