Repository navigation
Sync upstream main (333d015: REFER stays in Confirmed) - #13
Merged
Merged
Conversation
# Conflicts: # src/dialog/dialog.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge upstream
restsend/rsipstackmain(333d015, "Keep established dialog state while dispatching REFER") into the fork.Confirmed, no extraConfirmedafter the REFER response).DialogInner::transition()against our fork fix (notify only applied transitions): resolved by keeping our structure and addingDialogState::Referto the event-only arm — the same resolution as upstream PR fix: notify dialog state only for transitions that are applied restsend/rsipstack#148 (fb7eb5f).handle_referinInviteDialog/ServerInviteDialognow takes the upstream form (noreturn_to_confirmed); INFO / UPDATE / MESSAGE / NOTIFY are unchanged.mainbecomes an ancestor of the fork, so future syncs are plain merges andgit log upstream/main..mainshows only our changes.Checks:
cargo test— 369 lib (368 + the new upstream REFER test) + 65 doc passed, 0 failed.rustfmt --checkclean ondialog.rs(the new upstreamtest_refer.rsis not rustfmt-clean upstream; left untouched).🤖 Generated with Claude Code
https://claude.ai/code/session_01L1Gu5CifqgBjASbxYmJ6mr