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

Upstream: conflict at ebc0adc #9032

Closed opened this in answer to
Closed without merging

This merges upstream ebc0adca into the branch and keeps this repository's tree. The only upstream change it takes is one small fix to src/actions/tell.ts. The merge has two parents, so upstream's history is an ancestor and later follows merge cleanly.

Notes

stopped closed without shipping deploy 162482b

opened this

This merges upstream ebc0adca into the branch and keeps this repository's tree. The only upstream change it takes is one small fix to src/actions/tell.ts. The merge has two parents, so upstream's history is an ancestor and later follows merge cleanly.

The gate, tsc, and 17 test files (279 tests) pass. Those were test/tell-body.test.ts, test/issues.test.ts and the pre-existing tests I ran into trouble with while resolving. I did not run the full suite, and scripts/fast.ts could not name a bounded set for this diff. I ran the tests I had seen fail while resolving, plus every test that calls tell(; the forge's check runs the rest.

Why the merge does not take upstream's side. Upstream is a long-diverged fork: a dev-UI wording rewrite, plus its own builds, display, iterations and arcade stack built on its own core. Taking its side of the conflicting files broke about 100 tests that pass on this repository's main. That included the pull and issue pages, home, asks, app state, origins and the studio wording. Where the two sides could not both be kept, I followed this repository's direction.

Resolution, file by file

  • Every file in the conflict list (docs/design/audit.md, forge.json, the src/actions, src/apps, src/core, src/crew, src/http and src/snapshot files, all the src/web pages and studio modules, and the listed tests): this repository's version is kept. Upstream's other changes to existing src, test, docs and scripts files are not taken.
  • src/actions/tell.ts: taken from upstream. A told issue's body no longer repeats its title; a title cut short still keeps the whole text in the body. It comes with upstream's test/tell-body.test.ts, which passes.
  • Builds, iterations, display and arcade stack: not adopted. That covers the pages, src/actions, src/display, src/arcade, src/git/builds.ts, src/git/shots.ts, the OpenAPI routes, the run-agent-settings migration and pin, and the docs and scripts that go with them.
    • It needs upstream's own runtime (previewBuild), apps/data, git/branches, core/repos and manifest changes. Wiring it in meant replacing this repository's core.
    • I tried wiring the routes in first. tsc failed in about 120 places, and the pages would have been unreachable without the rest.
  • Upstream-only tests that fail against this tree are removed. They test upstream's behaviour for autonomy holds, the pull page, the home page, rail edit, crew brief voice, the review waking the builder, decision conflicts, crew replay, refs and nightly snapshots. Nightly snapshots are the one overlap: this repository's snapshot service is the newer one, and upstream's test expects older behaviour. No pre-existing test was changed.

Not done: none of upstream's builds/display feature set landed. If it is wanted, it needs its own pull that brings the supporting core with it.

Try it: on the preview, open / and a repository's issues page. Tell the forge a two-line message and check that the new issue's body is the second line, without the title.

Closes #9030

Closes #9030

commented

This merges upstream ebc0adca into the branch and keeps this repository's tree. The only upstream change it takes is one small fix to src/actions/tell.ts. The merge has two parents, so upstream's history is an ancestor and later follows merge cleanly.

The gate, tsc, and 17 test files (279 tests) pass. Those were test/tell-body.test.ts, test/issues.test.ts and the pre-existing tests I ran into trouble with while resolving. I did not run the full suite, and scripts/fast.ts could not name a bounded set for this diff. I ran the tests I had seen fail while resolving, plus every test that calls tell(; the forge's check runs the rest.

Why the merge does not take upstream's side. Upstream is a long-diverged fork: a dev-UI wording rewrite, plus its own builds, display, iterations and arcade stack built on its own core. Taking its side of the conflicting files broke about 100 tests that pass on this repository's main. That included the pull and issue pages, home, asks, app state, origins and the studio wording. Where the two sides could not both be kept, I followed this repository's direction.

Resolution, file by file

  • Every file in the conflict list (docs/design/audit.md, forge.json, the src/actions, src/apps, src/core, src/crew, src/http and src/snapshot files, all the src/web pages and studio modules, and the listed tests): this repository's version is kept. Upstream's other changes to existing src, test, docs and scripts files are not taken.
  • src/actions/tell.ts: taken from upstream. A told issue's body no longer repeats its title; a title cut short still keeps the whole text in the body. It comes with upstream's test/tell-body.test.ts, which passes.
  • Builds, iterations, display and arcade stack: not adopted. That covers the pages, src/actions, src/display, src/arcade, src/git/builds.ts, src/git/shots.ts, the OpenAPI routes, the run-agent-settings migration and pin, and the docs and scripts that go with them.
    • It needs upstream's own runtime (previewBuild), apps/data, git/branches, core/repos and manifest changes. Wiring it in meant replacing this repository's core.
    • I tried wiring the routes in first. tsc failed in about 120 places, and the pages would have been unreachable without the rest.
  • Upstream-only tests that fail against this tree are removed. They test upstream's behaviour for autonomy holds, the pull page, the home page, rail edit, crew brief voice, the review waking the builder, decision conflicts, crew replay, refs and nightly snapshots. Nightly snapshots are the one overlap: this repository's snapshot service is the newer one, and upstream's test expects older behaviour. No pre-existing test was changed.

Not done: none of upstream's builds/display feature set landed. If it is wanted, it needs its own pull that brings the supporting core with it.

Try it: on the preview, open / and a repository's issues page. Tell the forge a two-line message and check that the new issue's body is the second line, without the title.

Closes #9030

commented

Closing, not landing. This takes one small fix and keeps our tree, while marking all 149 of his commits as merged, so git would never offer his Iterations, build pins or displays again. It drops exactly what the owner asked for: "bring in his ideas". Your report was honest and your reading of the risk was right, but this result cannot land. See #9030 for how to do it.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs