Function code_auto_merge

atomic-core/src/merge/engine.rs:816–850

()

    #[test]
    fn code_auto_merge() {
        let mut txn = MockTxn::new();
        let store = MemoryChangeStore::new();

        let base_hash = make_change(&store, b"fn main() { return 0; }");
        let base_id = NodeId::new(1);
        txn.register(base_id, base_hash);

        let left_hash = make_change(&store, b"fn main() { return 1; }");
        let left_id = NodeId::new(2);
        txn.register(left_id, left_hash);

        let right_hash = make_change(&store, b"fn run() { return 0; }");
        let right_id = NodeId::new(3);
        txn.register(right_id, right_hash);

        let engine = SemanticMergeEngine::new(&txn, &store);

        let v_base = GraphNode::new(base_id, ChangePosition::new(0), ChangePosition::new(23));
        let v_left = GraphNode::new(left_id, ChangePosition::new(0), ChangePosition::new(23));
        let v_right = GraphNode::new(right_id, ChangePosition::new(0), ChangePosition::new(22));

        let group = ConflictGroup::new(vec![v_left, v_right]).with_ancestor(v_base);
        let outcome = engine.try_merge(&group).unwrap();

        assert!(
            outcome.is_auto_merged(),
            "expected AutoMerged, got {:?}",
            outcome
        );
        assert_eq!(
            std::str::from_utf8(outcome.content()).unwrap(),
            "fn run() { return 1; }",
        );
    }
}