mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 06:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

conflicts: merge modify/delete and delete/modify tests

Browse source 
The two tests only differ in the order of the changes in the input, so
let's reuse some of the setup code.
This commit is contained in:
Martin von Zweigbergk 2023-02-17 09:54:26 -08:00 committed by Martin von Zweigbergk
parent af3f8b6cfd
commit dfcc7a9cee
1 changed files with 16 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
lib/tests/test_conflicts.rs
View file

@ -128,17 +128,17 @@ line 4
line 5
",
);
let left_id = testutils::write_file(
let modified_id = testutils::write_file(
store,
&path,
"line 1
line 2
left
modified
line 4
line 5
",
);
let right_id = testutils::write_file(
let deleted_id = testutils::write_file(
store,
&path,
"line 1
@ -148,9 +148,13 @@ line 5
",
);
// left modifies a line, right deletes the same line.
let conflict = Conflict {
removes: vec![file_conflict_part(&base_id)],
adds: vec![file_conflict_part(&left_id), file_conflict_part(&right_id)],
adds: vec![
file_conflict_part(&modified_id),
file_conflict_part(&deleted_id),
],
};
insta::assert_snapshot!(&materialize_conflict_string(store, &path, &conflict), @r###"
line 1
@ -159,65 +163,29 @@ line 5
%%%%%%%
-line 3
+++++++
left
modified
>>>>>>>
line 4
line 5
"###
);
}
#[test]
fn test_materialize_conflict_delete_modify() {
let test_repo = TestRepo::init(false);
let store = test_repo.repo.store();
let path = RepoPath::from_internal_string("file");
let base_id = testutils::write_file(
store,
&path,
"line 1
line 2
line 3
line 4
line 5
",
);
let left_id = testutils::write_file(
store,
&path,
"line 1
line 2
line 4
line 5
",
);
let right_id = testutils::write_file(
store,
&path,
"line 1
line 2
right
line 4
line 5
",
);
// right modifies a line, left deletes the same line.
let conflict = Conflict {
removes: vec![file_conflict_part(&base_id)],
adds: vec![file_conflict_part(&left_id), file_conflict_part(&right_id)],
adds: vec![
file_conflict_part(&deleted_id),
file_conflict_part(&modified_id),
],
};
insta::assert_snapshot!(
&materialize_conflict_string(store, &path, &conflict),
@r###"
insta::assert_snapshot!(&materialize_conflict_string(store, &path, &conflict), @r###"
line 1
line 2
<<<<<<<
%%%%%%%
-line 3
+++++++
right
modified
>>>>>>>
line 4
line 5