Commit 71403a25 by PLN (Algolia)

docs(log): 043 — correct the unblock path; nobody needs to commit anything

The first version told a cold reader to wait for the peer session to commit
tools/check-mix.py and tools/gig-log.py before the main tree could be
fast-forwarded. That precondition does not exist, and left as written it would
have parked the tree waiting on a commit that was never coming.

The peer flagged it; verified independently before amending. For both files the
working-tree blob equals origin/master and equals f56775ae, and only HEAD differs.
They show as 'M' because the shared tree's HEAD (5468507b) predates master's
shared-ladder refactor (27f23515, which changed both to import
tools/ardour_session.py) — the tree already holds the post-refactor content. Not
in-flight work: the tree is simply behind its own HEAD's successor.

Also verified, since 'one command' is a promise: HEAD is a true ancestor of
f56775ae, and the branch touches NONE of PLN's five modified .tidal files, so his
set prep survives the fast-forward untouched.

The caution that remains is a different one, and it is real: the live rig runs
from that tree via ~/.local/bin symlinks, so the fast-forward swaps code under a
running system and wants three units restarted afterwards. That is PLN's call
with eyes on the rig, not a housekeeping step to slip in overnight.
parent f56775ae
......@@ -67,11 +67,32 @@ branch are out of step on purpose:
playing tonight is 5468507 — verified working. The peer's midiviz close-X and
close-latch are on the branch but not yet live locally.
To resolve: once the peer commits `check-mix.py` / `gig-log.py`, fast-forward the
main tree to `origin/claude/rig-streamline` and restart `parvagues-bridge`,
`midiviz` and `perf-tray`. Until then, do further work in the worktree.
**To resolve — one command, no waiting on anyone.** The first version of this log
said to wait for the peer session to commit `check-mix.py` / `gig-log.py`. That
was wrong, and the peer corrected it: those two are **not** in-flight edits. They
read as `M` only because the shared tree's HEAD (5468507) predates master's
shared-ladder refactor (`27f2351`, which changed both files to import
`tools/ardour_session.py`) — the working tree already holds the POST-refactor
content. Verified independently before amending: for both files the working-tree
blob equals `origin/master` equals `f56775a`, while only `HEAD` differs. So there
is nothing to lose and nobody to wait for.
git checkout -- tools/check-mix.py tools/gig-log.py
git merge --ff-only claude/rig-streamline
That `checkout` restores HEAD's older copy for a moment and the fast-forward
immediately replaces it with the merged version — the same content the tree holds
right now. Also checked: `HEAD` is a true ancestor of `f56775a`, and the branch
touches **none** of PLN's five modified `.tidal` files, so his set prep survives
the fast-forward untouched.
**But do it with eyes on the rig, not tonight.** The live rig runs from this tree
via `~/.local/bin` symlinks, so the fast-forward swaps code under a running
system and then wants `parvagues-bridge`, `midiviz` and `perf-tray` restarted.
Doing that with nobody watching is PLN's call, not a housekeeping step. Until it
happens, further work belongs in the worktree.
## Sillage
Everything mechanical from the gear-failure night is closed (log 042). What is
left is four judgements and one backup run.
left is four judgements, one backup run, and one fast-forward.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment