MCPcopy Create free account
hub / github.com/atomicdotdev/atomic / code_auto_merge

Function code_auto_merge

atomic-core/src/merge/engine.rs:888–922  ·  view source on GitHub ↗
()

Source from the content-addressed store, hash-verified

886
887 #[test]
888 fn code_auto_merge() {
889 let mut txn = MockTxn::new();
890 let store = MemoryChangeStore::new();
891
892 let base_hash = make_change(&store, b"fn main() { return 0; }");
893 let base_id = NodeId::new(1);
894 txn.register(base_id, base_hash);
895
896 let left_hash = make_change(&store, b"fn main() { return 1; }");
897 let left_id = NodeId::new(2);
898 txn.register(left_id, left_hash);
899
900 let right_hash = make_change(&store, b"fn run() { return 0; }");
901 let right_id = NodeId::new(3);
902 txn.register(right_id, right_hash);
903
904 let engine = SemanticMergeEngine::new(&txn, &store);
905
906 let v_base = GraphNode::new(base_id, ChangePosition::new(0), ChangePosition::new(23));
907 let v_left = GraphNode::new(left_id, ChangePosition::new(0), ChangePosition::new(23));
908 let v_right = GraphNode::new(right_id, ChangePosition::new(0), ChangePosition::new(22));
909
910 let group = ConflictGroup::new(vec![v_left, v_right]).with_ancestor(v_base);
911 let outcome = engine.try_merge(&group).unwrap();
912
913 assert!(
914 outcome.is_auto_merged(),
915 "expected AutoMerged, got {:?}",
916 outcome
917 );
918 assert_eq!(
919 std::str::from_utf8(outcome.content()).unwrap(),
920 "fn run() { return 1; }",
921 );
922 }
923}

Callers

nothing calls this directly

Calls 5

with_ancestorMethod · 0.80
make_changeFunction · 0.70
registerMethod · 0.45
unwrapMethod · 0.45
try_mergeMethod · 0.45

Tested by

no test coverage detected