wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update erikj_federation.rst

Browse source 
Update state resolution rules to indicate what you should do if none of the merged events are allowed by the newly merged auth events.
This commit is contained in:
Erik Johnston 2015-01-20 11:08:43 +00:00
parent 38efa9c5c2
commit 5279541c28
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drafts/erikj_federation.rst
View file

@ -188,9 +188,9 @@ We want the following rules to apply:
#. If power levels have been changed on two different branches use the rules #. If power levels have been changed on two different branches use the rules
above, ensuring that the one picked is a valid change from the one not picked. above, ensuring that the one picked is a valid change from the one not picked.
#. Similarly handle membership changes (e.g. bans, kicks, etc.) #. Similarly handle membership changes (e.g. bans, kicks, etc.)
#. If a power level has been changed in a branch, then any state merged from the #. Any state merged must be allowed by the newly merged auth events. If none of
other branch *must* be allowed by the power level event change. Otherwise, the candidate events for a given state are allowed, we pick the last event
use the current one from the branch where the power level event changed. given by the ordering above (i.e. we pick one with the least depth).