MCPcopy Create free account
hub / github.com/libgit2/pygit2 / test_merge_octopus

Function test_merge_octopus

test/test_merge.py:308–324  ·  view source on GitHub ↗
(mergerepo: Repository)

Source from the content-addressed store, hash-verified

306
307
308def test_merge_octopus(mergerepo: Repository) -> None:
309 branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
310 branch_id = mergerepo[branch_head_hex].id
311 ancestor_id = mergerepo.merge_base_octopus([mergerepo.head.target, branch_id])
312
313 merge_index = mergerepo.merge_trees(
314 ancestor_id, mergerepo.head.target, branch_head_hex
315 )
316 assert merge_index.conflicts is None
317 merge_commits_tree = merge_index.write_tree(mergerepo)
318
319 mergerepo.merge(branch_id)
320 index = mergerepo.index
321 assert index.conflicts is None
322 merge_tree = index.write_tree()
323
324 assert merge_tree == merge_commits_tree
325
326
327def test_merge_mergeheads(mergerepo: Repository) -> None:

Callers

nothing calls this directly

Calls 3

merge_treesMethod · 0.80
write_treeMethod · 0.80
mergeMethod · 0.80

Tested by

no test coverage detected

Used in the wild real call sites across dependent graphs

searching dependent graphs…