Part of bzrlib.conflicts View In Hierarchy
| Method | action_take_this | Undocumented |
| Method | action_take_other | Undocumented |
Inherited from HandledPathConflict:
| Method | __init__ | Undocumented |
| Method | as_stanza | Undocumented |
| Method | _cmp_list | Undocumented |
Inherited from HandledConflict (via HandledPathConflict):
| Method | associated_filenames | The names of the files generated to help resolve the conflict. |
Inherited from Conflict (via HandledPathConflict, HandledConflict):
| 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 | _do | Apply the specified action to the conflict. |
| Method | _resolve_with_cleanups | Undocumented |