What happened
mq land on repo recallnet/aggregator-okf integrated a topic branch onto the local protected main at base 4834c82. Meanwhile origin/main had advanced out-of-band to 24bf314 (a GitHub PR #1 merged directly on GitHub, not via this mq instance). My commit 3f243d8 integrated on top of 4834c82, so local protected main and origin/main diverged (shared base 4834c82).
The publish is now stuck: mq doctor shows publish_request 14 active_stage: push, unpublished: true, worker pid actively retrying a push that can't fast-forward (origin is at 24bf314, not an ancestor of 3f243d8). The land command hung (killed at 2m).
Expected
sync-before-integrate should fetch and detect the out-of-band origin advance and either rebase the topic onto the real origin tip before integrating, or fail fast with guidance — not integrate onto a stale local base and strand an unpublishable protected commit.
Environment
mq daemonless; SyncPolicy=sync-before-integrate, Strategy=rebase-then-ff, publish Mode=manual/coalesced. mq's latest_published_sha is 4834c82 (it never observed the out-of-band 24bf314).
Impact
Protected main diverged from origin; a good commit is stranded and the publish worker is stuck. Recovering manually by rebasing onto origin and re-landing.
What happened
mq landon reporecallnet/aggregator-okfintegrated a topic branch onto the local protected main at base4834c82. Meanwhile origin/main had advanced out-of-band to24bf314(a GitHub PR #1 merged directly on GitHub, not via this mq instance). My commit3f243d8integrated on top of4834c82, so local protected main and origin/main diverged (shared base4834c82).The publish is now stuck:
mq doctorshows publish_request 14active_stage: push,unpublished: true, worker pid actively retrying a push that can't fast-forward (origin is at24bf314, not an ancestor of3f243d8). The land command hung (killed at 2m).Expected
sync-before-integrateshould fetch and detect the out-of-band origin advance and either rebase the topic onto the real origin tip before integrating, or fail fast with guidance — not integrate onto a stale local base and strand an unpublishable protected commit.Environment
mq daemonless; SyncPolicy=sync-before-integrate, Strategy=rebase-then-ff, publish Mode=manual/coalesced. mq's
latest_published_shais4834c82(it never observed the out-of-band24bf314).Impact
Protected main diverged from origin; a good commit is stranded and the publish worker is stuck. Recovering manually by rebasing onto origin and re-landing.