diff options
Diffstat (limited to '')
| -rw-r--r-- | synapse/state.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py index b081de8f4f..d8977b61ea 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -157,7 +157,10 @@ class StateHandler(object): defer.returnValue(True) return - if new_branch[-1] == current_branch[-1]: + n = new_branch[-1] + c = current_branch[-1] + + if n.pdu_id == c.pdu_id and n.origin == c.origin: # We have all the PDUs we need, so we can just do the conflict # resolution. |