ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib/tests
Martin von Zweigbergk 598cfcb89b merged_tree: in diff iterator, maintain legacy/modern variant in subtree
As #2165 showed, when diffing two `MergedTree::Legacy` variants (or
one of each variant) and re recurse into a subtree, we need to treat
that as a legacy tree too, so we expand `TreeValue::Conflict`s found
in the diff.
2023-08-26 05:58:54 -07:00
..
test_bad_locking.rs
test_commit_builder.rs commits: use empty strings instead of placeholders for missing name or email 2023-08-18 17:22:59 -05:00
test_commit_concurrent.rs
test_conflicts.rs merge: add Merge::num_sides() 2023-08-25 08:54:49 -07:00
test_default_revset_graph_iterator.rs revset_graph: preserve original parents order 2023-07-29 05:36:09 +09:00
test_diff_summary.rs
test_git.rs git: propagate errors for missing commits when importing refs 2023-08-11 05:06:36 +00:00
test_id_prefix.rs revset: resolve "@" symbol's workspace id earlier (while parsing) 2023-08-20 17:57:18 -07:00
test_index.rs
test_init.rs commits: use empty strings instead of placeholders for missing name or email 2023-08-18 17:22:59 -05:00
test_load_repo.rs
test_merge_trees.rs cleanup: replace x[n..n+l] by x[n..][..l] 2023-08-21 22:29:46 -07:00
test_merged_tree.rs merged_tree: add entry iterator 2023-08-25 07:06:20 -07:00
test_mut_repo.rs
test_operations.rs
test_refs.rs conflicts: move Merge<T> to merge module 2023-08-06 22:08:09 +00:00
test_revset.rs revset: add separate name@remote node to discriminate it from quoted one 2023-08-26 07:47:12 +09:00
test_rewrite.rs
test_view.rs tests: move commit_transactions() helper to testutils 2023-08-10 06:27:16 +09:00
test_working_copy.rs merged_tree: in diff iterator, maintain legacy/modern variant in subtree 2023-08-26 05:58:54 -07:00
test_working_copy_concurrent.rs working_copy: get diff from MergedTrees 2023-08-25 06:40:36 -07:00
test_working_copy_sparse.rs working_copy: get diff from MergedTrees 2023-08-25 06:40:36 -07:00
test_workspace.rs