Skip to content
zit Check-in [c5243e961f]
Login

Check-in [c5243e961f]

Overview
Comment:config export, and merge --probe over a stack

config export AREA [FILE] writes fossil's configuration export format, so an area can be backed up before import replaces it; import and merge now apply /shun cards, add-only in both modes. merge --probe with several NAMEs answers each against TARGET with the ones before it landed, holding merged files in memory and moving the merge base with the landing. Release 0.3.28.

Timelines: family | ancestors | descendants | both | trunk | version-0.3.28
Files: files | file ages | folders
SHA3-256: c5243e961fdcf6d7b1aaf4e1b32e7db9dec7800c7b4132ab38831c61032b43ab
User & Date: dmestas on 2026-09-23 13:47:42.453
Other Links: manifest | tags
Context
2026-09-23
18:33
inflate: a truncated dynamic-block header is the end of the stream, not a crash

tossBitsShort added the consumed bits where it must subtract them, so a header ending one byte short tossed past the end of the input and the next peek read a wrapped length off the stack. Found by the nightly soak four nights running. Release 0.3.29. check-in: 362f18d357 user: dmestas tags: trunk, version-0.3.29

13:47
config export, and merge --probe over a stack

config export AREA [FILE] writes fossil's configuration export format, so an area can be backed up before import replaces it; import and merge now apply /shun cards, add-only in both modes. merge --probe with several NAMEs answers each against TARGET with the ones before it landed, holding merged files in memory and moving the merge base with the landing. Release 0.3.28. check-in: c5243e961f user: dmestas tags: trunk, version-0.3.28

2026-09-22
17:34
protected branches: admit a cancel on a check-in the server does not hold

The pusher's recovery from a refused push, amend --branch, was refused too. A cancel on an unheld target removes it from nothing held, so the check-in is judged where it joins, with a same-round branch move counted. A held check-in re-offered in a push is no longer judged as joining. The e2e raw-push fixture compared raw digests to hex and excluded nothing. Release 0.3.27. check-in: d4571a4b1a user: dmestas tags: trunk, version-0.3.27

Changes