Tags and Properties for Check-in aff1d04310
- branch=merge-probe propagates to descendants
- closed propagates to descendants added by [3057fcae0e] on 2026-08-24 12:16:57
- sym-merge-probe propagates to descendants
- sym-trunk cancelled
|
2026-08-24
| ||
| 12:16 | • Edit [aff1d04310]: Add propagating "closed". artifact: 3057fcae0e user: dmestas | |
| 02:17 |
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. closed check-in: aff1d04310 user: dmestas tags: merge-probe | |