bzrlib.plugins.news_merge.news_merge.NewsMerger : API documentation

Method

Perform a simple 3-way merge of a bzr NEWS file.

Method	__init__	Create a PerFileMerger for use with merger.
Method	file_matches	Check whether the file should call the merge hook.
Method	merge_matching	Merge the contents of a single file that has matched the criteria

Inherited from PerFileMerger (via ConfigurableFileMerger):

Method	get_filename	Lookup the filename (i.e. basename, not path), given a Tree (e.g.
Method	get_filepath	Calculate the path to the file in a tree.
Method	merge_contents	Merge the contents of a single file.

def merge_text(self, params):

overrides bzrlib.merge.ConfigurableFileMerger.merge_text

Perform a simple 3-way merge of a bzr NEWS file.

Each section of a bzr NEWS file is essentially an ordered set of bullet points, so we can simply take a set of bullet points, determine which bullets to add and which to remove, sort, and reserialize.

b.p.n.n.NewsMerger(merge.ConfigurableFileMerger) : class documentation