Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-26 13:04:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

conflicted state, not full conflicted state

Browse source
This commit is contained in:
David Robertson 2022-06-13 17:03:22 +01:00
parent 4c65f97cd1
commit 8ca5bb4bd7
No known key found for this signature in database
GPG key ID: 903ECE108A39DEDD
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
content/rooms/fragments/v2-state-res.md
View file

@ -52,12 +52,12 @@ event *E* in *S*.
**Auth difference.** **Auth difference.**
The *auth difference* is calculated by first calculating the full auth The *auth difference* is calculated by first calculating the full auth
chain for each state *S*<sub>*i*</sub>, and then discarding the events chain for each state *S*<sub>*i*</sub>, and then discarding the events
belonging to each full auth chain. In symbols: if *C*(*S*) is the full auth belonging to each full auth chain. In symbols: if *F*(*S*) is the full auth
chain of a collection of events *S*, the auth difference is chain of a collection of events *S*, the auth difference is
∪<sub>*i*</sub> *C*(*S<sub>i*</sub>) - ∩<sub>*i*</sub> *C*(*S<sub>i</sub>*). ∪<sub>*i*</sub> *F*(*S<sub>i*</sub>) - ∩<sub>*i*</sub> *F*(*S<sub>i</sub>*).
This can be [computed more efficiently](https://github.com/matrix-org/matrix-spec/issues/1118) as This can be [computed more efficiently](https://github.com/matrix-org/matrix-spec/issues/1118) as
*C*(*F*) - ∩<sub>*i*</sub> *C*(*S<sub>i* - *F*) , *F*(*C*) - ∩<sub>*i*</sub> *F*(*S<sub>i* - *C*) ,
where *F* is the full conflicted set. where *C* is the conflicted state set.
**Full conflicted set.** **Full conflicted set.**
The *full conflicted set* is the union of the conflicted state set and The *full conflicted set* is the union of the conflicted state set and