(mergerepo: Repository)
| 216 | |
| 217 | |
| 218 | def test_merge_trees(mergerepo: Repository) -> None: |
| 219 | branch_id = pygit2.Oid(hex='03490f16b15a09913edb3a067a3dc67fbb8d41f1') |
| 220 | ancestor_id = mergerepo.merge_base(mergerepo.head.target, branch_id) |
| 221 | |
| 222 | merge_index = mergerepo.merge_trees(ancestor_id, mergerepo.head.target, branch_id) |
| 223 | assert merge_index.conflicts is None |
| 224 | merge_commits_tree = merge_index.write_tree(mergerepo) |
| 225 | |
| 226 | mergerepo.merge(branch_id) |
| 227 | index = mergerepo.index |
| 228 | assert index.conflicts is None |
| 229 | merge_tree = index.write_tree() |
| 230 | |
| 231 | assert merge_tree == merge_commits_tree |
| 232 | |
| 233 | |
| 234 | def test_merge_trees_favor(mergerepo: Repository) -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…