From 138bbf23df239cddaf31950b4ea025d876531485 Mon Sep 17 00:00:00 2001 From: nexy7574 Date: Wed, 8 Oct 2025 20:03:45 +0100 Subject: [PATCH] fix: Weird re-application of partially resolved state (cherry picked from commit 7c74db5e740877455b9c9a519bd9c4aee522ce00) --- src/core/matrix/state_res/mod.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/core/matrix/state_res/mod.rs b/src/core/matrix/state_res/mod.rs index a8e1459b..0e0b5ec5 100644 --- a/src/core/matrix/state_res/mod.rs +++ b/src/core/matrix/state_res/mod.rs @@ -217,14 +217,8 @@ where ) .await?; - // Add unconflicted state to the resolved state - // We priorities the unconflicting state + // Ensure unconflicting state is in the final state resolved_state.extend(clean); - if stateres_version == StateResolutionVersion::V2_1 { - resolved_state.extend(resolved_control); - // TODO(hydra): this feels disgusting and wrong but it allows - // the state to resolve properly? - } debug!("state resolution finished"); trace!( map = ?resolved_state, "final resolved state" );