From b573c95381db7ea60d5ca0d9e36410dc84971fbe Mon Sep 17 00:00:00 2001 From: David Robertson Date: Mon, 30 May 2022 14:08:38 +0100 Subject: [PATCH] Rich's suggestion for the union bit --- content/rooms/fragments/v2-state-res.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/rooms/fragments/v2-state-res.md b/content/rooms/fragments/v2-state-res.md index 59ba7008..3e901f23 100644 --- a/content/rooms/fragments/v2-state-res.md +++ b/content/rooms/fragments/v2-state-res.md @@ -124,8 +124,8 @@ the auth event is not rejected. The *resolution* of a set of states is obtained as follows: 1. Select all *power events* that appear in the *full conflicted set*. Compute - the union of their *auth chains*. Sort the union using the - *reverse topological power ordering*. + the union of their auth chains, including the power events themselves. + Sort the union using the *reverse topological power ordering*. 2. Apply the *iterative auth checks algorithm*, starting from the *unconflicted state map*, to the list of events from the previous step to get a partially resolved state.