(mergerepo: Repository)
| 203 | |
| 204 | |
| 205 | def test_merge_commits_favor(mergerepo: Repository) -> None: |
| 206 | branch_head = pygit2.Oid(hex='1b2bae55ac95a4be3f8983b86cd579226d0eb247') |
| 207 | |
| 208 | merge_index = mergerepo.merge_commits( |
| 209 | mergerepo.head.target, branch_head, favor=MergeFavor.OURS |
| 210 | ) |
| 211 | assert merge_index.conflicts is None |
| 212 | |
| 213 | # Incorrect favor value |
| 214 | with pytest.raises(TypeError, match=r'favor argument must be MergeFavor'): |
| 215 | mergerepo.merge_commits(mergerepo.head.target, branch_head, favor='foo') # type: ignore |
| 216 | |
| 217 | |
| 218 | def test_merge_trees(mergerepo: Repository) -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…