Handle new state events which don't have a common ancestor

2024-10-01 01:36:05 -04:00 · 2014-09-03 15:50:05 +01:00 · 2014-09-03 15:50:05 +01:00 · b5f9d47c89
commit b5f9d47c89
parent e4c40158c5
1 changed files with 12 additions and 0 deletions
--- a/synapse/state.py
+++ b/synapse/state.py
@ -179,6 +179,18 @@ class StateHandler(object):
                key=lambda x: x.depth
            )

+            if not hasattr(missing_prev, "prev_state_id"):
+                # FIXME Hmm
+                # temporary fallback
+                for algo in conflict_res:
+                    new_res, curr_res = algo(new_branch, current_branch)
+
+                    if new_res < curr_res:
+                        defer.returnValue(False)
+                    elif new_res > curr_res:
+                        defer.returnValue(True)
+                return
+
            pdu_id = missing_prev.prev_state_id
            origin = missing_prev.prev_state_origin