diff --git a/AGENTS.md b/AGENTS.md index 072ccc6f48..4479db6d1e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -471,10 +471,14 @@ script (or equivalent `repo bump-fork ` command) MUST: backward compatibility for recipes that reference the `recipes/` path while still preferring the local fork as the source of truth. -**Implementation status**: Detection is partially implemented via Cargo's -own lockfile collision errors. Full automatic detection and remediation -requires changes to `src/cook/fetch.rs` (version comparison logic) and the -addition of `local/scripts/bump-fork.sh`. Until fully automated, the manual +**Implementation status**: Detection is fully implemented across 5 tools: +- `sync-versions.sh`: Cat 0 (cookbook) + Cat 1 (in-house) + Cat 2 (fork +rb suffix) versions +- `verify-fork-versions.sh`: Cat 2 fork supremacy + content check vs upstream tag +- `verify-patch-content.py`: orphan-patch detection + operator-decision automation +- `bump-fork.sh` + `upgrade-forks.sh`: fork rebase + patch reapplication +- `push-fork-branches.sh`: operator-reviewed fork push helper + +See `local/docs/HOOKS.md` for the full tool inventory (10 tools as of Phase 9.2). process is: 1. `cd local/sources/` 2. Edit `Cargo.toml` version field to match upstream diff --git a/local/fork-upstream-map.toml b/local/fork-upstream-map.toml index cd19c75127..86caaefb1e 100644 --- a/local/fork-upstream-map.toml +++ b/local/fork-upstream-map.toml @@ -34,7 +34,7 @@ libredox https://gitlab.redox-os.org/redox-os/libredox.git 0.1.18 sna redoxfs https://gitlab.redox-os.org/redox-os/redoxfs.git 0.9.1 snapshot redox-scheme https://gitlab.redox-os.org/redox-os/redox-scheme.git 0.11.2 snapshot relibc https://gitlab.redox-os.org/redox-os/relibc.git 0.2.5 snapshot -kernel https://gitlab.redox-os.org/redox-os/kernel.git 0.5.12 snapshot +kernel https://gitlab.redox-os.org/redox-os/kernel.git 0.6.0 diverged # fork tracks upstream/master via merge commits; 316 files / 41K lines diverge; full rebase is Phase 2.4+ work bootloader https://gitlab.redox-os.org/redox-os/bootloader.git 1.0.0 diverged # fork advanced beyond upstream 1.0.0 (927 vs 77 files) -- full rebase to newer upstream tag is Phase 2.4+ work installer https://gitlab.redox-os.org/redox-os/installer.git 0.2.42 diverged # fork has TUI GUI + Red Bear config additions not in upstream 0.2.42 -- content check advisory only; full rebase is Phase 2.4+ work userutils https://gitlab.redox-os.org/redox-os/userutils.git 0.1.0 snapshot