ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/cli/tests
History
Martin von Zweigbergk 2ccb17b7b3 cli: enable tree-level conflicts by default 
I have used the tree-level conflict format for several weeks without
problem (after the fix in 51b5d168ae). Now - right after the 0.10.0
release - seems like a good time to enable the config by default.

I enabled the config in our default configs in the CLI crate to reduce
impact on tests (compared to changing the default in `settings.rs`).
2023-10-05 10:31:47 -07:00
..
common cli tests: Move current_operation_id to test_utils 2023-08-22 17:39:56 -07:00
test_abandon_command.rs cli: make set of immutable commits configurable 2023-09-25 15:41:45 -07:00
test_alias.rs commands: Implement next and prev 2023-09-05 23:13:39 +02:00
test_branch_command.rs cli: redefine default log revset using immutable_heads() 2023-10-01 11:15:30 -07:00
test_builtin_aliases.rs revsets: add trunk alias with default to main/master/root 2023-09-17 10:17:23 +10:00
test_cat_command.rs
test_checkout.rs cli: hint for same change ids 2023-09-21 22:53:46 -03:00
test_chmod_command.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
test_commit_command.rs commands: support path arguments to jj commit 2023-09-30 21:45:06 -05:00
test_commit_template.rs cli: ensure first new HEAD is detached 2023-10-03 00:58:22 +09:00
test_concurrent_operations.rs
test_config_command.rs cleanup: fix warnings from nightly clippy 2023-08-14 22:11:56 -07:00
test_debug_command.rs revset: convert root symbol to function 2023-09-04 10:36:30 +09:00
test_describe_command.rs cli: add support for setting default description 2023-08-13 23:59:15 +05:30
test_diff_command.rs revset: convert root symbol to function 2023-09-04 10:36:30 +09:00
test_diffedit_command.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
test_duplicate_command.rs cli: jj duplicate should refuse to duplicate only the root commit 2023-09-25 15:41:45 -07:00
test_edit_command.rs cli: make set of immutable commits configurable 2023-09-25 15:41:45 -07:00
test_git_clone.rs cleanup: fix warnings from nightly clippy 2023-08-14 22:11:56 -07:00
test_git_colocated.rs git: add hack to unset Git HEAD by using placeholder ref 2023-10-05 01:32:48 +09:00
test_git_fetch.rs cli: don't list commits abandoned by import/fetch, just print the number 2023-10-03 14:07:56 +09:00
test_git_import_export.rs cli tests: Move current_operation_id to test_utils 2023-08-22 17:39:56 -07:00
test_git_push.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
test_git_remotes.rs git: prohibit creation of remote named "git" 2023-08-29 22:50:46 +09:00
test_git_submodule.rs cli: ensure first new HEAD is detached 2023-10-03 00:58:22 +09:00
test_gitignores.rs
test_global_opts.rs release: release version 0.10.0 2023-10-04 16:45:45 -07:00
test_immutable_commits.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
test_init_command.rs cli: add context to checkout/abandon messages triggered by automated git import 2023-10-02 17:31:05 +09:00
test_interdiff_command.rs revset: convert root symbol to function 2023-09-04 10:36:30 +09:00
test_log_command.rs cli: report error on bad short-prefixes revset 2023-10-01 11:15:30 -07:00
test_move_command.rs
test_new_command.rs revset: convert root symbol to function 2023-09-04 10:36:30 +09:00
test_next_prev_commands.rs commands: Implement next and prev 2023-09-05 23:13:39 +02:00
test_obslog_command.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
test_operations.rs Allow \0 escape for nulls 2023-09-14 17:11:05 -04:00
test_rebase_command.rs revset: convert root symbol to function 2023-09-04 10:36:30 +09:00
test_resolve_command.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
test_restore_command.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
test_revset_output.rs revset: translate symbol rules in error message 2023-09-07 15:29:39 +09:00
test_show_command.rs
test_sparse_command.rs
test_split_command.rs cli: when splitting change without description, skip it on second part 2023-08-15 10:12:12 -07:00
test_squash_command.rs
test_status_command.rs Fix .gitignore handling of ignored directories 2023-08-22 22:08:32 -07:00
test_templater.rs cli: redefine default log revset using immutable_heads() 2023-10-01 11:15:30 -07:00
test_tree_level_conflicts.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
test_undo.rs cli: make set of immutable commits configurable 2023-09-25 15:41:45 -07:00
test_unsquash_command.rs
test_untrack_command.rs
test_util_command.rs
test_working_copy.rs working_copy: in LockedWorkingCopy::drop(), discard unsaved changes 2023-09-01 12:25:47 -07:00
test_workspaces.rs cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00