jj/lib/tests
Martin von Zweigbergk deb4ae476d merged_tree: add an iterator over conflicts
With `MergedTree`, we can iterate over conflicts by descending into
only the subdirectories that cannot be trivially resolved. We assume
that the trees have previously been resolved as much as possible, so
we don't attempt to resolve conflicts again.
2023-07-19 22:04:16 -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 cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02: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 cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02:00
test_default_revset_graph_iterator.rs cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02: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 view: replace .tags().get(name) with .get_tag(name) 2023-07-19 08:27:42 +09:00
test_id_prefix.rs cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02: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 cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02:00
test_load_repo.rs cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02:00
test_merge_trees.rs cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02:00
test_merged_tree.rs merged_tree: add an iterator over conflicts 2023-07-19 22:04:16 -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 cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib 2023-07-09 06:40:43 +02:00
test_refs.rs refs: reimplement RefTarget as Conflict<Option<CommitId>> wrapper 2023-07-18 18:12:09 +09:00
test_revset.rs refactor(jj-lib): remove allow(unknown_lints) 2023-07-17 18:38:26 -05:00
test_rewrite.rs refs: reimplement RefTarget as Conflict<Option<CommitId>> wrapper 2023-07-18 18:12:09 +09:00
test_view.rs view: store Option<RefTarget> in maps, add extension trait to flatten Option 2023-07-18 18:12:09 +09:00
test_working_copy.rs working_copy: return Result from WorkingCopy::tree_state/WorkingCopy::tree_state_mut 2023-07-14 13:45:40 -07:00
test_working_copy_concurrent.rs working_copy: return Result from WorkingCopy::tree_state/WorkingCopy::tree_state_mut 2023-07-14 13:45:40 -07:00
test_working_copy_sparse.rs working_copy: return Result from WorkingCopy::tree_state/WorkingCopy::tree_state_mut 2023-07-14 13:45:40 -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