(mergerepo: Repository)
| 232 | |
| 233 | |
| 234 | def test_merge_trees_favor(mergerepo: Repository) -> None: |
| 235 | branch_head_hex = '1b2bae55ac95a4be3f8983b86cd579226d0eb247' |
| 236 | ancestor_id = mergerepo.merge_base(mergerepo.head.target, branch_head_hex) |
| 237 | merge_index = mergerepo.merge_trees( |
| 238 | ancestor_id, mergerepo.head.target, branch_head_hex, favor=MergeFavor.OURS |
| 239 | ) |
| 240 | assert merge_index.conflicts is None |
| 241 | |
| 242 | with pytest.raises(TypeError): |
| 243 | mergerepo.merge_trees( |
| 244 | ancestor_id, |
| 245 | mergerepo.head.target, |
| 246 | branch_head_hex, |
| 247 | favor='foo', # type: ignore |
| 248 | ) |
| 249 | |
| 250 | |
| 251 | def test_merge_options() -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…