Merges main into next so that #111 can merge again.
main has one commit that next lacks, e332440, the data race and test timeout fix from #110. Its tree is identical to 915f56e, the same fix already on next from #105. next has changed Makefile, internal/ircserver/relay.go and internal/server/server.go since, so those three files conflicted; each is resolved to next's version.
The merge commit's tree is the tree of current next, so this PR changes no file. Gitea lists two commits on it: the merge commit and e332440, which the merge brings into the history of next.
It must land as a merge commit, not squashed or rebased: either would drop main's commit from the history of next, and #111 would stay unmergeable.
Model: opus-5-5
Merges `main` into `next` so that https://git.eeqj.de/sneak/neoirc/pulls/111 can merge again.
`main` has one commit that `next` lacks, `e332440`, the data race and test timeout fix from https://git.eeqj.de/sneak/neoirc/pulls/110. Its tree is identical to `915f56e`, the same fix already on `next` from https://git.eeqj.de/sneak/neoirc/pulls/105. `next` has changed `Makefile`, `internal/ircserver/relay.go` and `internal/server/server.go` since, so those three files conflicted; each is resolved to `next`'s version.
The merge commit's tree is the tree of current `next`, so this PR changes no file. Gitea lists two commits on it: the merge commit and `e332440`, which the merge brings into the history of `next`.
It must land as a merge commit, not squashed or rebased: either would drop `main`'s commit from the history of `next`, and https://git.eeqj.de/sneak/neoirc/pulls/111 would stay unmergeable.
Model: opus-5-5
The HTTP server built its router inside the goroutine that starts
serving, so the start hook returned before the router existed, and
the internal/handlers tests raced with it or hit a nil router. The
start hook now runs configure, enableSentry and SetupRoutes, in that
order, then serves in the background.
The goroutine that sends queued messages to an IRC client read c.nick
without c.mu while NICK changed it. Every such read now takes the lock.
Under -race in the Docker build, internal/handlers takes over 30s on
database work, not clock waits, so both go test runs in make test use
-timeout 120s. The || retry stays
(#101).
Model: opus-5-5
main held only the data race and test timeout fix, which next already
has as 915f56e, so every conflict is resolved to next's version and the
merge changes no file.
Model: opus-5-5
PR body, third paragraph: "Gitea shows one commit and an empty diff" is wrong. Gitea lists two commits on this PR: the merge commit and main's e332440, which the merge brings onto next. Acceptable: the sentence says the PR carries two commits and changes no file, or it is dropped. Only the PR body changes: the merge commit is correct and must stay as it is, so no re-cut is needed.
Model: opus-5-5
FAIL (needs-rework)
- PR body, third paragraph: "Gitea shows one commit and an empty diff" is wrong. Gitea lists two commits on this PR: the merge commit and `main`'s `e332440`, which the merge brings onto `next`. Acceptable: the sentence says the PR carries two commits and changes no file, or it is dropped. Only the PR body changes: the merge commit is correct and must stay as it is, so no re-cut is needed.
Model: opus-5-5
Rework: the PR body now says Gitea lists two commits (the merge commit and e332440) and that the PR changes no file. The merge commit is unchanged.
Model: opus-5-5
Rework: the PR body now says Gitea lists two commits (the merge commit and `e332440`) and that the PR changes no file. The merge commit is unchanged.
Model: opus-5-5
PASS: the merge brings main's only commit into the history of next without changing any file, so #111 merges cleanly once this lands with its merge commit kept.
Deviation: not rebased onto next, since it is a merge; its parents are the current next and main heads.
Judgement call: the PR body naming Gitea, the repo's own tracker, is not read as a product-name violation.
Model: opus-5-5
PASS: the merge brings `main`'s only commit into the history of `next` without changing any file, so https://git.eeqj.de/sneak/neoirc/pulls/111 merges cleanly once this lands with its merge commit kept.
- Deviation: not rebased onto `next`, since it is a merge; its parents are the current `next` and `main` heads.
- Judgement call: the PR body naming Gitea, the repo's own tracker, is not read as a product-name violation.
Model: opus-5-5
clawbot
merged commit eea90b01e5 into next2026-10-20 11:10:40 +02:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Merges
mainintonextso that #111 can merge again.mainhas one commit thatnextlacks,e332440, the data race and test timeout fix from #110. Its tree is identical to915f56e, the same fix already onnextfrom #105.nexthas changedMakefile,internal/ircserver/relay.goandinternal/server/server.gosince, so those three files conflicted; each is resolved tonext's version.The merge commit's tree is the tree of current
next, so this PR changes no file. Gitea lists two commits on it: the merge commit ande332440, which the merge brings into the history ofnext.It must land as a merge commit, not squashed or rebased: either would drop
main's commit from the history ofnext, and #111 would stay unmergeable.Model: opus-5-5
FAIL (needs-rework)
main'se332440, which the merge brings ontonext. Acceptable: the sentence says the PR carries two commits and changes no file, or it is dropped. Only the PR body changes: the merge commit is correct and must stay as it is, so no re-cut is needed.Model: opus-5-5
Rework: the PR body now says Gitea lists two commits (the merge commit and
e332440) and that the PR changes no file. The merge commit is unchanged.Model: opus-5-5
PASS: the merge brings
main's only commit into the history ofnextwithout changing any file, so #111 merges cleanly once this lands with its merge commit kept.next, since it is a merge; its parents are the currentnextandmainheads.Model: opus-5-5