(mergerepo: Repository)
| 58 | |
| 59 | |
| 60 | def test_cherrypick_remove_conflicts(mergerepo: Repository) -> None: |
| 61 | assert mergerepo.state() == RepositoryState.NONE |
| 62 | assert not mergerepo.message |
| 63 | |
| 64 | other_branch_tip = '1b2bae55ac95a4be3f8983b86cd579226d0eb247' |
| 65 | mergerepo.cherrypick(other_branch_tip) |
| 66 | |
| 67 | assert mergerepo.state() == RepositoryState.CHERRYPICK |
| 68 | assert mergerepo.message.startswith('commit to provoke a conflict') |
| 69 | |
| 70 | idx = mergerepo.index |
| 71 | conflicts = idx.conflicts |
| 72 | assert conflicts is not None |
| 73 | conflicts['.gitignore'] |
| 74 | del idx.conflicts['.gitignore'] |
| 75 | with pytest.raises(KeyError): |
| 76 | conflicts.__getitem__('.gitignore') |
| 77 | assert idx.conflicts is None |
| 78 | |
| 79 | mergerepo.state_cleanup() |
| 80 | assert mergerepo.state() == RepositoryState.NONE |
| 81 | assert not mergerepo.message |
nothing calls this directly
no test coverage detected
searching dependent graphs…