From 2cba03fa6af4aeca176d69514603bce26b9c934a Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 31 Oct 2026 18:39:31 +0100 Subject: remake coordination use document, not automerge --- src/remake/proposal.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/remake/proposal.rs') diff --git a/src/remake/proposal.rs b/src/remake/proposal.rs index ede25d2..d9cd893 100644 --- a/src/remake/proposal.rs +++ b/src/remake/proposal.rs @@ -5,13 +5,13 @@ use std::collections::HashSet; -use automerge::ChangeHash; use tracing::info; use super::coordinator; use super::records::{self, Decision, Phase, Proposal, Record, Vote}; use super::{Host, kind, vote}; use crate::clock::UnixMillis; +use crate::document::ChangeHash; use crate::document::store::StoreError; use crate::force::Force; @@ -220,9 +220,7 @@ pub(super) async fn propose( if !base_at_commit { let base = match base { Some(base) => { - if let Some(unknown) = base - .iter() - .find(|head| doc.get_change_by_hash(head).is_none()) + if let Some(unknown) = crate::document::changes::missing(doc, &base).first() { return Err(StartError::UnknownBase(unknown.to_string())); } -- cgit v1.3.1