replay: support replaying 2-parent merges #27823

Triggered via pull request May 17, 2026 15:46

dscho

synchronize #2106

dscho:support-merge-commits-in-git-history

Status Failure

Total duration 53m 29s

Artifacts 4

main.yml

on: pull_request

Matrix: dockerized

Matrix: regular

Matrix: win+VS test

Matrix: win+Meson test

Matrix: win test

Annotations

20 errors, 36 warnings, and 22 notices

linux-leaks (ubuntu:rolling)

failed: t3650.12 using replay to rebase two branches, one on top of other

linux-leaks (ubuntu:rolling)

failed: t3650.11 reverting a merge commit is rejected

linux-leaks (ubuntu:rolling)

failed: t3650.10 replaying an octopus merge is rejected

linux-leaks (ubuntu:rolling)

failed: t3650.9 using replay to rebase a 2-parent merge

linux-leaks (ubuntu:rolling)

failed: t3454.11 previously-resolved conflicts with diff3

linux-leaks (ubuntu:rolling)

failed: t3454.10 file containing literal conflict-marker bytes survives a replay-merge

linux-leaks (ubuntu:rolling)

failed: t3454.9 vanishing conflict in a replayed merge

linux-leaks (ubuntu:rolling)

failed: t3454.8 newly-introduced binary conflict is reported

linux-leaks (ubuntu:rolling)

failed: t3454.7 newly-introduced conflict in a replayed merge

linux-leaks (ubuntu:rolling)

failed: t3454.6 preserves resolutions; does not extrapolate

linux-reftable-leaks (ubuntu:rolling)

failed: t3650.12 using replay to rebase two branches, one on top of other

linux-reftable-leaks (ubuntu:rolling)

failed: t3650.11 reverting a merge commit is rejected

linux-reftable-leaks (ubuntu:rolling)

failed: t3650.10 replaying an octopus merge is rejected

linux-reftable-leaks (ubuntu:rolling)

failed: t3650.9 using replay to rebase a 2-parent merge

linux-reftable-leaks (ubuntu:rolling)

failed: t3454.11 previously-resolved conflicts with diff3

linux-reftable-leaks (ubuntu:rolling)

failed: t3454.10 file containing literal conflict-marker bytes survives a replay-merge

linux-reftable-leaks (ubuntu:rolling)

failed: t3454.9 vanishing conflict in a replayed merge

linux-reftable-leaks (ubuntu:rolling)

failed: t3454.8 newly-introduced binary conflict is reported

linux-reftable-leaks (ubuntu:rolling)

failed: t3454.7 newly-introduced conflict in a replayed merge

linux-reftable-leaks (ubuntu:rolling)

failed: t3454.6 preserves resolutions; does not extrapolate

win+Meson build

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

fedora-breaking-changes-meson (fedora:latest)

JGit wasn't installed, see above for clues why

fedora-breaking-changes-meson (fedora:latest)

git-lfs wasn't installed, see above for clues why

fedora-breaking-changes-meson (fedora:latest)

perforce wasn't installed, see above for clues why

win+Meson test (4)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

linux-musl-meson (alpine:latest)

JGit wasn't installed, see above for clues why

linux-musl-meson (alpine:latest)

git-lfs wasn't installed, see above for clues why

linux-musl-meson (alpine:latest)

perforce wasn't installed, see above for clues why

linux32 (i386/ubuntu:focal)

JGit wasn't installed, see above for clues why

linux32 (i386/ubuntu:focal)

git-lfs wasn't installed, see above for clues why

linux32 (i386/ubuntu:focal)

perforce wasn't installed, see above for clues why

debian-11 (debian:11)

JGit wasn't installed, see above for clues why

debian-11 (debian:11)

git-lfs wasn't installed, see above for clues why

debian-11 (debian:11)

perforce wasn't installed, see above for clues why

win+Meson test (7)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

almalinux-8 (almalinux:8)

JGit wasn't installed, see above for clues why

almalinux-8 (almalinux:8)

git-lfs wasn't installed, see above for clues why

almalinux-8 (almalinux:8)

perforce wasn't installed, see above for clues why

win+Meson test (2)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

win+Meson test (9)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

win+Meson test (6)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

win+Meson test (5)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

win+Meson test (8)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

osx-reftable (macos-14)

JGit wasn't installed, see above for clues why

osx-reftable (macos-14)

Already linked: /opt/homebrew/Cellar/gettext/1.0

win+Meson test (3)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

win+Meson test (0)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

osx-gcc (macos-14)

JGit wasn't installed, see above for clues why

osx-gcc (macos-14)

Already linked: /opt/homebrew/Cellar/gettext/1.0

win+Meson test (1)

The `python-version` input is not set. The version of Python currently in `PATH` will be used.

osx-meson (macos-14)

JGit wasn't installed, see above for clues why

osx-meson (macos-14)

pcre2 10.47_1 is already installed and up-to-date. To reinstall 10.47_1, run: brew reinstall pcre2

osx-meson (macos-14)

ninja 1.13.2 is already installed and up-to-date. To reinstall 1.13.2, run: brew reinstall ninja

osx-meson (macos-14)

Already linked: /opt/homebrew/Cellar/gettext/1.0

osx-clang (macos-14)

JGit wasn't installed, see above for clues why

osx-clang (macos-14)

Already linked: /opt/homebrew/Cellar/gettext/1.0

win+Meson build