Skip to main content

sync_with_ancestry

gonzalo_core::sync

Function sync_with_ancestry 

Source 
pub async fn sync_with_ancestry(
    a: &dyn Store,
    b: &dyn Store,
    ancestry: Option<&dyn BlobStore>,
) -> Result<SyncReport>
Expand description

As sync, but 3-way-merges divergent Structured bodies against their real common ancestor when one is available. ancestry is a content-addressed store of past bodies keyed by revision hash (see AncestryStore): when two records diverge from a shared parent revision whose body it holds, that body is the merge base; otherwise sync falls back to the empty base (ADR 0016).