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

Function test_merge_commits

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

Source from the content-addressed store, hash-verified

188
189
190def test_merge_commits(mergerepo: Repository) -> None:
191 branch_head = pygit2.Oid(hex='03490f16b15a09913edb3a067a3dc67fbb8d41f1')
192
193 merge_index = mergerepo.merge_commits(mergerepo.head.target, branch_head)
194 assert merge_index.conflicts is None
195 merge_commits_tree = merge_index.write_tree(mergerepo)
196
197 mergerepo.merge(branch_head)
198 index = mergerepo.index
199 assert index.conflicts is None
200 merge_tree = index.write_tree()
201
202 assert merge_tree == merge_commits_tree
203
204
205def test_merge_commits_favor(mergerepo: Repository) -> None:

Callers

nothing calls this directly

Calls 3

merge_commitsMethod · 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…