jj/lib/tests
Yuya Nishihara 1cd6f9f6a8 conflicts: pack marker style/len into struct, merge materialize functions
I'm thinking of adding an option to do word-by-word merging, which will be pass
down to files::merge_hunks() through materialize_merge_result*(). Since tree
merging should also respect this option, it will be carried by the Store, and
copied to ConflictMaterializeOptions.
2025-09-03 09:34:44 +00:00
..
runner.rs local working copy: add support for EOL conversion 2025-07-17 15:36:28 +00:00
test_annotate.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_bad_locking.rs tests: add a helper for writing random commit with given parents 2025-07-31 04:56:34 +00:00
test_commit_builder.rs commit_builder: make .generate_new_change_id() not imply commit is duplicated 2025-08-14 08:44:32 +00:00
test_commit_concurrent.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_conflicts.rs conflicts: pack marker style/len into struct, merge materialize functions 2025-09-03 09:34:44 +00:00
test_default_revset_graph_iterator.rs revset_graph: fix out-of-bounds bit set lookup in remove_transitive_edges() 2025-08-07 14:46:08 +00:00
test_eol.rs working_copy: Move conlfict_marker_styles to TreeState 2025-09-03 00:40:52 +00:00
test_evolution_predecessors.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_fix.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_git.rs lib: support negative refspecs on git remotes 2025-08-25 15:55:18 +00:00
test_git_backend.rs index: let MutableIndex::add_commit() return error 2025-08-01 01:12:32 +00:00
test_gpg.rs ci: Skip the GPG tests if they cannot pass on macOS 2025-08-23 13:48:25 +00:00
test_id_prefix.rs object_id: rename HexPrefix::new() to ::try_from_hex() for consistency 2025-07-02 01:56:40 +00:00
test_index.rs commit: make is_empty() and parent_tree() query index first 2025-08-21 09:38:38 +00:00
test_init.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_load_repo.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_local_working_copy.rs working_copy: Move conlfict_marker_styles to TreeState 2025-09-03 00:40:52 +00:00
test_local_working_copy_concurrent.rs working_copy: Move conlfict_marker_styles to TreeState 2025-09-03 00:40:52 +00:00
test_local_working_copy_sparse.rs working_copy: Move conlfict_marker_styles to TreeState 2025-09-03 00:40:52 +00:00
test_merge_trees.rs rewrite: make CommitRewriter::rebase() async 2025-08-06 03:12:05 +00:00
test_merged_tree.rs tests: slightly clarify a comment 2025-08-05 14:29:57 +00:00
test_mut_repo.rs tests: remove CommitGraphBuilder 2025-07-31 04:56:34 +00:00
test_operations.rs tests: remove CommitGraphBuilder 2025-07-31 04:56:34 +00:00
test_refs.rs tests: remove CommitGraphBuilder 2025-07-31 04:56:34 +00:00
test_revset.rs revset: integrate change-path index 2025-08-15 11:46:49 +00:00
test_revset_optimized.rs revset: add first_parent() function 2025-07-31 22:17:05 +00:00
test_rewrite.rs rewrite: make merge_commit_trees_no_resolve_without_repo() non-recursive 2025-08-20 13:58:10 +00:00
test_rewrite_duplicate.rs rewrite: make duplicate_commits() async 2025-08-06 03:12:05 +00:00
test_rewrite_transform.rs rewrite: make CommitRewriter::rebase() async 2025-08-06 03:12:05 +00:00
test_signing.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00
test_ssh_signing.rs ssh-signing: add revocation-list option 2025-07-29 12:46:36 +00:00
test_view.rs tests: remove CommitGraphBuilder 2025-07-31 04:56:34 +00:00
test_workspace.rs cli, lib: move to Rust 2024 language edition 2025-07-28 17:05:41 +00:00