(testrepo: Repository)
| 318 | |
| 319 | @utils.fails_in_macos |
| 320 | def test_add_conflict(testrepo: Repository) -> None: |
| 321 | ancestor_blob_id = testrepo.create_blob('ancestor') |
| 322 | ancestor = IndexEntry('conflict.txt', ancestor_blob_id, FileMode.BLOB_EXECUTABLE) |
| 323 | |
| 324 | ours_blob_id = testrepo.create_blob('ours') |
| 325 | ours = IndexEntry('conflict.txt', ours_blob_id, FileMode.BLOB) |
| 326 | |
| 327 | index = Index() |
| 328 | assert index.conflicts is None |
| 329 | |
| 330 | index.add_conflict(ancestor, ours, None) |
| 331 | |
| 332 | assert index.conflicts is not None |
| 333 | assert 'conflict.txt' in index.conflicts |
| 334 | conflict_ancestor, conflict_ours, conflict_theirs = index.conflicts['conflict.txt'] |
| 335 | assert conflict_ancestor.id == ancestor_blob_id |
| 336 | assert conflict_ancestor.mode == FileMode.BLOB_EXECUTABLE |
| 337 | assert conflict_ours.id == ours_blob_id |
| 338 | assert conflict_ours.mode == FileMode.BLOB |
| 339 | assert conflict_theirs is None |
nothing calls this directly
no test coverage detected
searching dependent graphs…