mirror of
https://github.com/matrix-org/matrix-spec
synced 2026-03-26 04:54:10 +01:00
Fix unintentional stateres change added in #1042
This commit is contained in:
parent
0cec7c7f1b
commit
18167bd853
|
|
@ -138,9 +138,11 @@ the auth event is not rejected.
|
||||||
|
|
||||||
The *resolution* of a set of states is obtained as follows:
|
The *resolution* of a set of states is obtained as follows:
|
||||||
|
|
||||||
1. Select all *power events* that appear in the *full conflicted set*. Compute
|
1. Select the set *X* of all *power events* that appear in the *full
|
||||||
the union of their auth chains, including the power events themselves.
|
conflicted set*. For each such power event *P*, enlarge *X* by adding
|
||||||
Sort the union using the *reverse topological power ordering*.
|
the events in the auth chain of *P* which also belong to the full
|
||||||
|
conflicted set. Sort $X$ into a list using the *reverse topological
|
||||||
|
power ordering*.
|
||||||
2. Apply the *iterative auth checks algorithm*, starting from the
|
2. Apply the *iterative auth checks algorithm*, starting from the
|
||||||
*unconflicted state map*, to the list of events from the previous
|
*unconflicted state map*, to the list of events from the previous
|
||||||
step to get a partially resolved state.
|
step to get a partially resolved state.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue