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

Function test_merge_many

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

Source from the content-addressed store, hash-verified

287
288
289def test_merge_many(mergerepo: Repository) -> None:
290 branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
291 branch_id = mergerepo[branch_head_hex].id
292 ancestor_id = mergerepo.merge_base_many([mergerepo.head.target, branch_id])
293
294 merge_index = mergerepo.merge_trees(
295 ancestor_id, mergerepo.head.target, branch_head_hex
296 )
297 assert merge_index.conflicts is None
298 merge_commits_tree = merge_index.write_tree(mergerepo)
299
300 mergerepo.merge(branch_id)
301 index = mergerepo.index
302 assert index.conflicts is None
303 merge_tree = index.write_tree()
304
305 assert merge_tree == merge_commits_tree
306
307
308def test_merge_octopus(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…