Artifact Description [ce464e3c8a]

Artifact ce464e3c8aa672568f0211ec219a3be37e2ebbf6a993cae47d490c7b62f5de10:

• File src/cmd/landing.zig
  • 2026-08-24 02:17:05 — part of check-in [aff1d04310] on branch merge-probe — merge --probe: mergeability for a pair the caller names (#134)

    landing show answers the same question but must find the record first, which is a full-store walk. A consumer with its own index already knows the record and both tips; --probe lets it ask about the pair and pay only for the merge. Release build on a 20MB store: 0.01s against 0.90s.

    Writes nothing, never autosyncs, and exits 0 whatever the answer -- 'has conflicts' is an answer, not a failure, so a caller reads the line rather than the status. Being a read it takes -R, and then --into is required because there is no checkout to supply the other side.

    The probe moves out of landing and next to the merge engine: one implementation, three callers. A real merge now refuses -R by name instead of failing as a discovery miss that tells you to pass the flag you just passed. (user: dmestas, size: 56555) [annotate] [blame] [check-ins using]

  • 2026-08-24 02:26:19 — part of check-in [83734fcc3d] on branch trunk — merge merge-probe: mergeability for a caller-named pair (#134) (user: dmestas, size: 56555) [annotate] [blame] [check-ins using]