(mergerepo: Repository)
| 66 | |
| 67 | |
| 68 | def test_merge_analysis_fastforward(mergerepo: Repository) -> None: |
| 69 | branch_head_hex = 'e97b4cfd5db0fb4ebabf4f203979ca4e5d1c7c87' |
| 70 | branch_id = mergerepo[branch_head_hex].id |
| 71 | |
| 72 | analysis, preference = mergerepo.merge_analysis(branch_id) |
| 73 | assert not analysis & MergeAnalysis.UP_TO_DATE |
| 74 | assert analysis & MergeAnalysis.FASTFORWARD |
| 75 | assert {} == mergerepo.status() |
| 76 | |
| 77 | analysis, preference = mergerepo.merge_analysis(branch_id, 'refs/heads/master') |
| 78 | assert not analysis & MergeAnalysis.UP_TO_DATE |
| 79 | assert analysis & MergeAnalysis.FASTFORWARD |
| 80 | assert {} == mergerepo.status() |
| 81 | |
| 82 | |
| 83 | def test_merge_no_fastforward_no_conflicts(mergerepo: Repository) -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…