Part of bzrlib.merge View In Hierarchy
Method | dump_file | Undocumented |
Method | text_merge | Perform a diff3 merge using a specified file-id and trans-id. |
Inherited from Merge3Merger:
Method | __init__ | Initialize the merger object and perform the merge. |
Method | do_merge | Undocumented |
Method | make_preview_transform | Undocumented |
Method | fix_root | Undocumented |
Method | write_modified | Undocumented |
Static Method | parent | Determine the parent for a file_id (used as a key method) |
Static Method | name | Determine the name for a file_id (used as a key method) |
Static Method | contents_sha1 | Determine the sha1 of the file contents (used as a key method). |
Static Method | executable | Determine the executability of a file-id (used as a key method). |
Static Method | kind | Determine the kind of a file-id (used as a key method). |
Static Method | scalar_three_way | Do a three-way test on a scalar. |
Method | merge_names | Undocumented |
Method | merge_contents | Fallback merge logic after user installed hooks. |
Method | get_lines | Return the lines in a file, or an empty list. |
Method | merge_executable | Perform a merge on the execute bit. |
Method | cook_conflicts | Convert all conflicts into a form that doesn't depend on trans_id |
Method | _do_merge | Undocumented |
Method | _make_preview_transform | Undocumented |
Method | _compute_transform | Undocumented |
Method | _finish_computing_transform | Finalize the transform and report the changes. |
Method | _entries3 | Gather data about files modified between three trees. |
Method | _entries_lca | Gather data about files modified between multiple trees. |
Static Method | _three_way | Undocumented |
Static Method | _lca_multi_way | Consider LCAs when determining whether a change has occurred. |
Method | _merge_names | Perform a merge on file_id names and parents |
Method | _do_merge_contents | Performs a merge on file_id contents. |
Method | _default_other_winner_merge | Replace this contents with other. |
Method | _get_filter_tree_path | Undocumented |
Method | _dump_conflicts | Emit conflict files. |
Method | _conflict_file | Emit a single conflict file. |
Method | _merge_executable | Perform a merge on the execute bit. |