28 lines
1.2 KiB
Markdown
28 lines
1.2 KiB
Markdown
# Row 141 round 2: rebase only (Sage)
|
|
|
|
Darkwing's round 1 (agents/darkwing/work/queue-141/, build.patch bb036c6d,
|
|
manifest d474b330, base 18aee8fa1) was approved by Filbert (28841). Row 148
|
|
(d4ea7e5a6) then changed two of its 26 paths: packages/bus/README.md and
|
|
packages/bus/src/broker.mjs.
|
|
|
|
Sage applied the round 1 patch unchanged with `git apply --index` onto
|
|
7e40fb83b with no conflicts. Both paths move by offset only:
|
|
|
|
- packages/bus/README.md: index line moved; its one hunk moved from 752/754
|
|
to 763/765, an 11-line offset from row 148's README addition.
|
|
- packages/bus/src/broker.mjs: index line moved; its four hunks moved by 5
|
|
(539/543 to 544/548) and by 41 for the other three (1536, 1583, 1917 to
|
|
1577, 1624, 1958). Row 148's broker lines above each hunk account for
|
|
the shift.
|
|
|
|
No other path's index or @@ line changed.
|
|
|
|
- build.patch: 72b890d9, the staged diff on 7e40fb83b
|
|
- candidate-manifest.sha256: cae29087, the same 26 paths. Only the two paths
|
|
above change hash.
|
|
- interdiff.txt: `diff` of the r1 and r2 build.patch. With `index ` and `@@ `
|
|
lines removed, both patches are byte-identical (checked with cmp).
|
|
|
|
The reviewer checks that interdiff.txt touches only index and @@ lines. Sage's
|
|
full landing gate runs on 7e40fb83b plus this patch.
|