docs: DIVERGENCE.md for v11.7.9 merge + correct the stale 25-file count #25

Merged

mohlec merged 1 commit from docs/divergence-2026-08-04 into slash/main

2026-08-05 01:32:30 +00:00

mohlec commented

2026-08-05 01:09:27 +00:00

Owner

Updates DIVERGENCE.md for the v11.7.9 merge (#22), per the REPO-CONVENTIONS definition-of-done.

Substantive corrections, not just a SHA bump:

Diverged-file count was wrong: 25 -> 173. The figure had been stale since the branding scrub (#17/#18) rewrote strings across 112+ webapp files without this doc absorbing them. Regenerated from the tree.
Churn recomputed. en.json is the actual hot spot at 142 upstream commits in 12 months; the doc previously led with config.go at 29. Fresh numbers: en.json 142, config.go 50, constants.tsx 38, admin_definition.tsx 38, api4/user.go 27.
Dropped the per-file table for the branding bulk. 121 component files + 28 images + en.json are string/asset replacements; listing them individually was never going to stay accurate, and check-branding.sh is what actually guards them. Replaced with a shape summary plus a focused table for the files that need human judgement.
Documented two traps found the hard way this week: slash-theme.css can only reference CopyPlugin-emitted assets (the #20 production 404), and a branding-looking en.json conflict can carry a real semantic change (the DCR allowlist case in #22).
Merge procedure rewritten to what actually worked: pre-merge overlap calculation that predicts the conflict surface in seconds, the diffstat sanity split (upstream deleting GitHub-Actions tooling reads as -64k deletions and is harmless), and the loopback push â€” the git server cannot reach git.ncwcom.com because there is no hairpin NAT.

Docs only, no code.

Updates `DIVERGENCE.md` for the v11.7.9 merge (#22), per the REPO-CONVENTIONS definition-of-done. **Substantive corrections, not just a SHA bump:** - **Diverged-file count was wrong: 25 -> 173.** The figure had been stale since the branding scrub (#17/#18) rewrote strings across 112+ webapp files without this doc absorbing them. Regenerated from the tree. - **Churn recomputed.** `en.json` is the actual hot spot at **142** upstream commits in 12 months; the doc previously led with `config.go` at 29. Fresh numbers: en.json 142, config.go 50, constants.tsx 38, admin_definition.tsx 38, api4/user.go 27. - **Dropped the per-file table for the branding bulk.** 121 component files + 28 images + en.json are string/asset replacements; listing them individually was never going to stay accurate, and `check-branding.sh` is what actually guards them. Replaced with a shape summary plus a focused table for the files that need human judgement. - **Documented two traps** found the hard way this week: `slash-theme.css` can only reference CopyPlugin-emitted assets (the #20 production 404), and a branding-looking `en.json` conflict can carry a real semantic change (the DCR allowlist case in #22). - **Merge procedure rewritten** to what actually worked: pre-merge overlap calculation that predicts the conflict surface in seconds, the diffstat sanity split (upstream deleting GitHub-Actions tooling reads as -64k deletions and is harmless), and the loopback push â€” the git server cannot reach `git.ncwcom.com` because there is no hairpin NAT. Docs only, no code.

mohlec added 1 commit

2026-08-05 01:09:27 +00:00

docs: update DIVERGENCE.md for the v11.7.9 merge

Build Slash Webapp / branding-audit (pull_request) Successful in 32s

Details

Build Slash Webapp / build-webapp (pull_request) Has been skipped

Details

3aa8bb5c14

- merged-through 8092c1a869 (11.7.7) -> 6e4777b430 (11.7.9), PR #22
- diverged-file count corrected 25 -> 173; the 25 figure had been stale
  since the branding scrub (PRs #17/#18) touched 112+ webapp files and
  this doc never absorbed them
- churn recomputed from the tree over the last 12 months; en.json is the
  real hot spot at 142 upstream commits, not config.go
- replaced the per-file table for the branding bulk with a shape summary;
  enumerating 149 string/asset files has no reader value, and the CI gate
  is what actually protects them
- documented two traps found the hard way: slash-theme.css can only
  reference CopyPlugin-emitted assets (issue #20), and a branding-looking
  conflict can carry a real semantic change (the DCR allowlist case)
- merge procedure rewritten to what actually works: pre-merge overlap
  calculation, diffstat sanity split, and the loopback push (the git
  server cannot reach git.ncwcom.com - no hairpin NAT)