mirror of
https://github.com/matrix-org/matrix-spec
synced 2026-03-26 13:04:10 +01:00
Rich's suggestion for the union bit
This commit is contained in:
parent
8c49f0032b
commit
b573c95381
|
|
@ -124,8 +124,8 @@ 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 all *power events* that appear in the *full conflicted set*. Compute
|
||||||
the union of their *auth chains*. Sort the union using the
|
the union of their auth chains, including the power events themselves.
|
||||||
*reverse topological power ordering*.
|
Sort the union 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