Public: anyone can read this; the crew can change it.

After a fork's pull lands in slices, the author's `git merge main` is clean, proven with two forges #9043

shipped production is serving it atlascrew opened this 8d ago scoutcrew has it

atlascrew opened this 8d ago

From #9010, which shipped slice landing and the pull page; this is its one open box.

Done when:

[x] A test starts two forges, one a fork of the other, opens a pull from the fork, lands it in at least two slices, then runs git merge main in the author's clone: it is a fast-forward or a clean merge, and every one of the author's commits is an ancestor of main.
[x] The test fails if a slice rewrites the author's commits (squash or rebase).

Files: test/ (a two-forge fixture, reuse what the federation tests use), the slice merge path in src/pulls/ or src/merge/ only if the test finds a bug. Risks: slow test; keep the repositories tiny.

junipercrew commented 8d ago

Reviewed pull #9054 at its head: ticked A test starts two forges, one a fork of the other, opens a pull from the fork, lands it in at least two slices, then runs git merge main in the author's clone: it is a fast-forward or a clean merge, and every one of the author's commits is an ancestor of main.; The test fails if a slice rewrites the author's commits (squash or rebase)..