Part of bzrlib.merge View In Hierarchy
Known subclasses: bzrlib.merge.ConfigurableFileMerger
This class is intended to be subclassed. The file_matches and merge_matching methods should be overridden with concrete implementations.
Method | file_matches | Return True if merge_matching should be called on this file. |
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. |
Method | merge_matching | Merge the contents of a single file that has matched the criteria |
Inherited from AbstractPerFileMerger:
Method | __init__ | Create a PerFileMerger for use with merger. |
Only called with merges of plain files with no clear winner.
Subclasses must override this.
Parameters | params | A MergeHookParams describing the file to merge |
tree | a Tree, e.g. self.merger.this_tree. |
Subclasses must override this.