Artifact Description [c88ba626ce]

Artifact c88ba626ceff9b3c0620f970be5bd6f4af73913c9c00ad7863d8a3c5b78f2860:

• File internal/checkout/merge.go
  • 2026-10-23 01:41:07 — part of check-in [78483726d9] on branch feat/horizon-cones — feat(sync): ask the list-form merge base whenever a merge crosses

    The re-pinned draft's 6.2.4 query is a primary and one or two secondaries, `pragma horizon-mergebase <primary> <secondary>...`, and the answer repeats the query in order and appends Fossil's pivot over the set. A two-hash query was answered as the base of a pair, so a merge into a checkout with a merge already pending could be told a base Fossil's merge would not choose. The origin now takes the list (sync.MergeBaseQuery), answers nothing when it lacks any named check-in or is asked more secondaries than a six-token card can repeat, and the client takes only an answer that repeats its query.

    5.5 now has the clone ask whenever either side's ancestry crosses the horizon, not only when its own walk does: over part of the graph the common ancestor found need not be the nearest. MergeContext, given a peer, checks the ancestry of the merged-in version, the checkout and its pending plain merges (content.AncestryCrosses), asks the pivot of the merged-in version over the checkout and those merges, and merges over the answer, falling back to Merge when the origin does not answer, as zit's merge does. With two merges already pending the query cannot carry them, and asking without them would name another base, so the merge is refused before anything changes.

    The deepen point's query names the target over C, as zit asks it. (user: [email protected], size: 38491) [annotate] [blame] [check-ins using]

  • 2026-10-23 01:57:19 — part of check-in [c216f38b6a] on branch feat/horizon-cones — Merge branch 'wip/repin-2445' into feat/horizon-cones

    The horizon draft re-pinned to zit horizon-rfc 24457c7dd6, the batch agreed with zit's author: the list-form merge-base query (at most two secondaries; silence when a named check-in is unknown), must-ask when either ancestry crosses the horizon, deepen refusing without a common ancestor, boundary labels over every held manifest, the seed's date and label, the structural fallback dropping the seed, and cursors voided when the leaves rule's held set grows below them. (user: [email protected], size: 38491) [annotate] [blame] [check-ins using]