Martin von Zweigbergk 23509e939e working_copy: get diff from MergedTrees ... To support tree-level conflicts, we're going to need to update the working copy from one `MergedTree` to another. We're going need to store multiple tree ids in the `tree_state` file. This patch gets us closer to that by getting the diff from `MergedTree`s`, even though we assume that they are legacy trees for now, so we can write to the single-tree `tree_state` file.		2023-08-25 06:40:36 -07:00
..
test_bad_locking.rs	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
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	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
test_conflicts.rs	conflicts: remove redundant num_removes argument from parse_conflict()	2023-08-13 09:54:16 +00: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	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
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	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
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	operation: propagate OpStoreError	2023-07-25 12:46:59 -05:00
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 diff iterator	2023-08-25 06:40:36 -07:00
test_mut_repo.rs	refs: add stub constructors for absent RefTarget, replace None with it	2023-07-17 08:24:24 +09:00
test_operations.rs	op_store: make ViewId and OperationId implement ObjectId	2023-07-26 14:17:21 -07:00
test_refs.rs	conflicts: move Merge<T> to merge module	2023-08-06 22:08:09 +00:00
test_revset.rs	revset: pass all context arguments to parse() via an object	2023-08-20 21:30:06 -07:00
test_rewrite.rs	refs: rename RefTarget::is_conflict() to has_conflict()	2023-07-23 22:25:57 +09:00
test_view.rs	tests: move commit_transactions() helper to testutils	2023-08-10 06:27:16 +09:00
test_working_copy.rs	working_copy: get diff from MergedTrees	2023-08-25 06:40:36 -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	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00