ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib/tests
Yuya Nishihara f1898a31b5 merge: simply print interleaved conflict values in debug output
We could apply that for the resolved case, but Resolved/Conflicted label
seems more useful than just printing Merge([value]).
2023-11-06 07:21:06 +09:00
..
test_bad_locking.rs workspace: load working copy implementation dynamically 2023-10-16 22:33:44 -07:00
test_commit_builder.rs merged_tree: propagate backend errors in diff iterator 2023-10-26 06:20:56 -07:00
test_commit_concurrent.rs testutils: delete bool-typed init() in favor of enum-typed version 2023-09-18 07:15:37 -07:00
test_conflicts.rs merge: simply print interleaved conflict values in debug output 2023-11-06 07:21:06 +09:00
test_default_revset_graph_iterator.rs test: use test backend in most remaining tests too 2023-09-24 21:24:01 -07:00
test_diff_summary.rs merged_tree: propagate backend errors in diff iterator 2023-10-26 06:20:56 -07:00
test_git.rs git: add config to disable abandoning of unreachable commits 2023-11-05 06:10:54 -08:00
test_id_prefix.rs testutils: delete bool-typed init() in favor of enum-typed version 2023-09-18 07:15:37 -07:00
test_index.rs test: use test backend in most remaining tests too 2023-09-24 21:24:01 -07:00
test_init.rs workspace: add function that initializes colocated git repository 2023-11-05 08:48:35 +09:00
test_load_repo.rs test: use test backend in most remaining tests too 2023-09-24 21:24:01 -07:00
test_local_working_copy.rs working copy: pass commit instead of tree into check_out() 2023-10-16 22:33:44 -07:00
test_local_working_copy_concurrent.rs workspace: load working copy implementation dynamically 2023-10-16 22:33:44 -07:00
test_local_working_copy_sparse.rs working copy: pass commit instead of tree into check_out() 2023-10-16 22:33:44 -07:00
test_merge_trees.rs merge: have Merge::adds()/removes() return iterator 2023-11-05 16:43:06 +09:00
test_merged_tree.rs merged_tree: propagate backend errors in diff iterator 2023-10-26 06:20:56 -07:00
test_mut_repo.rs view: add tracking state to RemoteRef 2023-10-16 23:21:05 +09:00
test_operations.rs tests: test views, operations, and mutable repos only with test backend 2023-09-20 07:47:30 -07:00
test_refs.rs tests: wherever we test with only one backend, use the test backend 2023-09-19 20:49:41 -07:00
test_revset.rs revset: add support for glob:pattern 2023-10-21 09:55:01 +09:00
test_rewrite.rs cli: add a function for restoring part of a tree from another tree 2023-11-02 06:07:45 -07:00
test_view.rs refs: merge tracking state of remote branches 2023-10-24 07:13:58 +09:00
test_workspace.rs workspace: make working-copy type customizable 2023-10-16 22:33:44 -07:00