Part of bzrlib.versionedfile View In Hierarchy
Method | __init__ | Undocumented |
Inherited from PlanWeaveMerge:
Method | base_from_plan | Construct a BASE file from the plan text. |
Method | _merge_struct | Return structured merge info. Must be implemented by subclasses. |
Inherited from TextMerge (via PlanWeaveMerge):
Method | struct_to_lines | Convert merge result tuples to lines |
Method | iter_useful | Iterate through input tuples, skipping empty ones. |
Method | merge_lines | Produce an iterable of lines, suitable for writing to a file |
Method | merge_struct | Produce structured merge info |
Static Method | reprocess_struct | Perform a two-way merge on structural merge info. |