b.v.PlanWeaveMerge(TextMerge) : class documentation

Part of bzrlib.versionedfile View In Hierarchy

Known subclasses: bzrlib.versionedfile.WeaveMerge

Weave merge that takes a plan as its input.

This exists so that VersionedFile.plan_merge is implementable. Most callers will want to use WeaveMerge instead.

Method __init__ Undocumented
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:

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.
def __init__(self, plan, a_marker=TextMerge.A_MARKER, b_marker=TextMerge.B_MARKER):
overrides bzrlib.textmerge.TextMerge.__init__
overridden in bzrlib.versionedfile.WeaveMerge
Undocumented
def _merge_struct(self):
overrides bzrlib.textmerge.TextMerge._merge_struct
Return structured merge info. Must be implemented by subclasses. See TextMerge docstring for details on the format.
def base_from_plan(self):
Construct a BASE file from the plan text.
API Documentation for Bazaar, generated by pydoctor at 2020-01-18 00:46:32.