release: rejoin the v0.8.0 line into main #50
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "release/v0.8.0"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Why
plumb release prepare --version v0.8.1refuses:and every verb that would clear it refuses in turn:
rejoinbecause the stablepointer never named v0.8.0,
retractbecause v0.8.0 is published. The statethat traps them is the one PerishLab/plumb#346 produced — a release published
and stamped but never made canonical.
The block itself is only a git ancestry fact.
11e19e2is577c439plus onecommit carrying
.plumb/releases/v0.8.0/datum.toml, and it exists only on theline. Nothing about the authority, the channel pointer, or any published object
is involved.
What
Merging the line into main is what rejoin means: the line's records settle back
into the trunk. The net change to main is one file:
Merge with a merge commit, not a squash — squashing rewrites the commit and the
ancestry
preparereads would still be false.Tests
git merge-treereports a clean merge. main keeps everything it has; the linecarries nothing newer.
Pull request closed