Repository navigation
chore: merge release into main - #5076
Conversation
|
ITERATE (reviewed What this isBack-merge of Blocking
if !header.flags.first_object
&& !fill.read().outstanding()
&& resume.is_none()
&& first.is_none_or(|first| first.id != 0)The release backport deliberately dropped JS ( Non-blocking
VerdictITERATE — merge This is an automated review, not the maintainer's decision |
Conflicts in js/net/src/ietf/subscriber.ts, js/net/src/ietf/subscriber.test.ts, and rs/moq-net/src/ietf/subscriber.rs resolve to main: release's side is the #5069 backport of #5027, which main already carries in full, including the resume.is_none() guard the backport dropped and the newer Encoder and moq_net_sim test harness. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Carries what
releasepublished (versions, CHANGELOGs, backports) back to trunk. Opened by the Back-merge workflow.Merge with a merge commit. Never squash. A squash leaves the merge base at the last cut, so the next back-merge conflicts. On a conflict, merge
mainintomerge/release-into-mainand resolve it there.Conflict resolution
mainwas merged into this branch (c74b271). The only release-side change was #5069, the backport of #5027, whichmainalready carries in full. Every conflict resolves tomain:rs/moq-net/src/ietf/subscriber.rs: keeps main'sopen_groupguard withresume.is_none(), which the backport dropped becausereleasehas no resume path. Taking release's side would drop a valid clear FIRST_OBJECT on a resumed subscription. The test helpers keep main'sEncoderandmoq_net_sim::testharness.js/net/src/ietf/subscriber.ts: main'sReadervalue import, which main's newer code uses.js/net/src/ietf/subscriber.test.ts: keeps main's added draft-16 mid-group test; both fix(net): accept a clear FIRST_OBJECT that starts at object 0 #5027 tests are already on main.The merged tree is identical to
main, so this PR only recordsreleaseancestry. #5072 is not included; a later back-merge carries it.Impact
(Written by Claude Opus 5.5)