Martin von Zweigbergk 44eb902171 working_copy: don't crash when updating and tracked file exits on disk ... Before this patch, when updating to a commit that has a file that's currently an ignored file on disk, jj would crash. After this patch, we instead leave the conflicting files or directories on disk. We print a helpful message about how to inspect the differences between the intended working copy and the actual working copy, and how to discard the unintended changes. Closes #976.		2023-10-07 14:02:31 -07:00
..
common	tests: disable parsing of system CA certificates in CLI tests	2023-10-08 02:41:20 +09:00
test_abandon_command.rs
test_alias.rs
test_branch_command.rs	cli: rephrase @git branch with no local counterpart as "deleted"	2023-10-07 19:33:35 +09:00
test_builtin_aliases.rs
test_cat_command.rs
test_checkout.rs
test_chmod_command.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_commit_command.rs
test_commit_template.rs
test_concurrent_operations.rs
test_config_command.rs
test_debug_command.rs
test_describe_command.rs
test_diff_command.rs
test_diffedit_command.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_duplicate_command.rs
test_edit_command.rs
test_git_clone.rs
test_git_colocated.rs	cli: in colocated repo, don't restore view.git_head on undo	2023-10-08 02:37:02 +09:00
test_git_fetch.rs
test_git_import_export.rs	git: look up "git" remote branches normally	2023-10-07 19:33:35 +09: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: on deserialize/import/export, copy refs/heads/* to remote named "git"	2023-10-07 19:33:35 +09:00
test_git_submodule.rs
test_gitignores.rs	working_copy: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
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
test_interdiff_command.rs
test_log_command.rs
test_move_command.rs
test_new_command.rs
test_next_prev_commands.rs
test_obslog_command.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_operations.rs
test_rebase_command.rs
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
test_show_command.rs
test_sparse_command.rs
test_split_command.rs
test_squash_command.rs
test_status_command.rs
test_templater.rs
test_tree_level_conflicts.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00
test_undo.rs
test_unsquash_command.rs
test_untrack_command.rs
test_util_command.rs
test_working_copy.rs
test_workspaces.rs	cli: enable tree-level conflicts by default	2023-10-05 10:31:47 -07:00