Part of bzrlib.plugins.changelog_merge.changelog_merge View In Hierarchy
|Method||get_filepath||Calculate the path to the file in a tree.|
|Method||merge_text||Merge changelog changes.|
Inherited from ConfigurableFileMerger:
|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|
|Method||get_filename||Lookup the filename (i.e. basename, not path), given a Tree (e.g.|
|Method||merge_contents||Merge the contents of a single file.|
This is overridden to return just the basename, rather than full path, so that e.g. if the config says changelog_merge_files = ChangeLog, then all ChangeLog files in the tree will match (not just one in the root of the tree).
|Parameters||params||A MergeHookParams describing the file to merge|
|tree||a Tree, e.g. self.merger.this_tree.|
Merge changelog changes.