(mergerepo: Repository)
| 81 | |
| 82 | |
| 83 | def test_merge_no_fastforward_no_conflicts(mergerepo: Repository) -> None: |
| 84 | branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1' |
| 85 | branch_id = mergerepo[branch_head_hex].id |
| 86 | analysis, preference = mergerepo.merge_analysis(branch_id) |
| 87 | assert not analysis & MergeAnalysis.UP_TO_DATE |
| 88 | assert not analysis & MergeAnalysis.FASTFORWARD |
| 89 | # Asking twice to assure the reference counting is correct |
| 90 | assert {} == mergerepo.status() |
| 91 | assert {} == mergerepo.status() |
| 92 | |
| 93 | |
| 94 | def test_merge_invalid_hex(mergerepo: Repository) -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…