b.m.AbstractPerFileMerger(object) : class documentation

Part of bzrlib.merge View In Hierarchy

Known subclasses: bzrlib.merge.PerFileMerger

PerFileMerger objects are used by plugins extending merge for bzrlib.

See bzrlib.plugins.news_merge.news_merge for an example concrete class.

Instance VariablesmergerThe Merge3Merger performing the merge.
Method __init__ Create a PerFileMerger for use with merger.
Method merge_contents Attempt to merge the contents of a single file.
def __init__(self, merger):
overridden in bzrlib.merge.ConfigurableFileMerger
Create a PerFileMerger for use with merger.
def merge_contents(self, merge_params):
overridden in bzrlib.merge.PerFileMerger
Attempt to merge the contents of a single file.
Parametersmerge_paramsA bzrlib.merge.MergeHookParams
ReturnsA tuple of (status, chunks), where status is one of 'not_applicable', 'success', 'conflicted', or 'delete'. If status is 'success' or 'conflicted', then chunks should be an iterable of strings for the new file contents.
API Documentation for Bazaar, generated by pydoctor at 2022-06-16 00:25:16.