Skip to content

Integrate tested M3.H Process Bus source into main without release drift - #299

Merged
masarray merged 643 commits into
mainfrom
integration/m3h-verified-source-to-main-20261024
Oct 24, 2026
Merged

masarray merged 643 commits into
mainfrom
integration/m3h-verified-source-to-main-20261024

Conversation

@masarray

@masarray masarray commented Oct 24, 2026 •

Copy link
Copy Markdown
Owner

Purpose

Integrate the exact final verified M3.H SV/PTP Studio + ESP32-P4 source into main, using an explicit two-parent merge, while retaining main's post-release docs/landing/CI updates. Do not rebuild or replace the existing Stable release assets.

Proof of source identity and Git reconciliation

  • Tested final M3.H source: a922e9bdba4e57a4e88406eb83344455dd8ff142 (10/10 exact-SHA workflows SUCCESS).
  • Candidate two-parent merge: 7b8c72e6df1a22c8e44d5b05dc1cad0bd0e11245, parents 19c5f08fa3d7fac28c2587ee76639cec9732a4e3 (main) and a922e9bdba4e57a4e88406eb83344455dd8ff142.
  • Guarded staging run SUCCESS: zero merge conflicts; implementation CMakeLists.txt, Studio, ESP32-P4, core include/src/tests/scripts/tools identical to tested baseline; all files changed on main after fork retained with exact blob SHA; PTP/SV CI workflow files retain tested source blob SHA; no force push.
  • Release binary hashes unchanged: Setup 4902e8bf..., Portable ca01424e..., ESP32-P4 BIN 61c508e9... (source/build ID a922e9bdba4e57a4).
  • 40.762934-second valid M3.H PCAP: 163,048 SV, 100% smpSynch=2, 0 missing/duplicate, 44 Announce, 43 each Sync/Follow_Up; 120-second endurance and real relay lock remain unverified, not prerequisites for a public isolated-lab simulator.

Merge gate

Refs: release, source audit.

Final Git ancestry provenance (release = main)

  • Final reviewed head: c90a9798508fe5146d53cf3173b2980ded557198.
  • Original source integration commit 7b8c72e6... merges main and the validated M3.H source exactly (source files untouched, current main files kept).
  • A second documented, tree-identical metadata/lineage merge carries the official release tag commit a4b6e53d0dbbcababc55ba8a4ff97ade6f2a6200 as a Git parent. Its tree is exactly 19a1a9ce34d0b5f0f56fe2fbc56cd93726ef5ec5, identical to the verified source integration tree. The tag's five commits add historical release documentation and an old prerelease publishing workflow; their ancestry is retained without re-enabling obsolete publisher logic or replacing newer Stable docs from main. Compare release tag...candidate: ahead, 0 behind.
  • CI gate for merge is the NEW exact candidate head c90a9798..., not the superseded first candidate 7b8c72e....

@masarray
masarray merged commit ad2ebd0 into main Oct 24, 2026
27 checks passed
masarray added a commit that referenced this pull request Oct 24, 2026
This was referenced Oct 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant