mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-26 14:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
jj/lib/tests
History
Martin von Zweigbergk 4c46398b1c conflicts: make update_from_content() write resolved content to store 
`update_from_content()` already writes file content for each term of
an unresolved merge, so it seems consistent for it to also write the
file content for resolved merges. I think this should simplify further
refactoring for tree-level conflicts and for preserving the executable
bit.
2023-08-11 23:59:44 +00: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 conflicts: make update_from_content() write resolved content to store 2023-08-11 23:59:44 +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 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 operation: propagate OpStoreError 2023-07-25 12:46:59 -05: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 conflicts: move Merge<T> to merge module 2023-08-06 22:08:09 +00: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: remove round-trip conversion from heads() evaluation 2023-08-12 02:16:29 +09: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 conflicts: move Merge<T> to merge module 2023-08-06 22:08:09 +00:00
test_working_copy_concurrent.rs tests: add TestWorkspace::snapshot() to simplify snapshotting 2023-07-28 09:32:18 -07:00
test_working_copy_sparse.rs tests: add TestWorkspace::snapshot() to simplify snapshotting 2023-07-28 09:32:18 -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