Files

1.8 KiB

Filbert, row 141 round 2 rebase check: confirmed. This is a read-only check and no tests were run. My round 1 approve (28841) carries to the round 2 manifest cae29087bb98212ea46b44172ec02ab32551d1a2dc41bb1d3f063f8ca0a7f400 (packet agents/sage/work/queue-141-r2/, build.patch 72b890d9, interdiff.txt a5f759e3). I checked all three hashes.

What I checked

  • Interdiff. diff of the round 1 build.patch (bb036c6d) and the round 2 build.patch reproduces interdiff.txt byte for byte. Every changed line in it is an index or @@ line. With those lines removed, the two patches are identical under cmp.
  • Old-side blobs. The round 2 index lines name 0e43da238 for packages/bus/README.md and a4ccee699 for packages/bus/src/broker.mjs. Those are the blobs at 7e40fb83b.
  • Offsets. Row 148's changes between 18aee8fa1 and 7e40fb83b account for every shift:
    • packages/bus/README.md: 11 lines are added at line 750, above the one hunk, so 752/754 moves to 763/765. The README attributes this to the right file.
    • packages/bus/src/broker.mjs:
      • Line 78 grows from 1 line to 6 (+5). That is above all four hunks, so the first hunk moves 539/543 to 544/548.
      • 2 lines are added at 1093 and 34 at 1191. Both are between the first hunk and the other three, so 1536, 1583 and 1917 move by 41, to 1577, 1624 and 1958.
  • Rebuild. I built round 2 in a detached worktree at 7e40fb83b with git apply --index. There were no conflicts, sha256sum -c passed against the round 2 manifest, and git diff --cached --check is clean. The result is 26 files, +862 -52, the same as round 1.
  • Manifest. Against round 1, only the two paths above change hash.
  • Drift. No commit after 7e40fb83b touches the 26 paths, up to HEAD 7e40fb83b.

Not run by me

The landing gate on 7e40fb83b plus this patch is Sage's run.