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
..
test_bad_locking.rs	testutils: delete bool-typed init() in favor of enum-typed version	2023-09-18 07:15:37 -07:00
test_commit_builder.rs	testutils: delete bool-typed init() in favor of enum-typed version	2023-09-18 07:15:37 -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	tests: wherever we test with only one backend, use the test backend	2023-09-19 20:49:41 -07: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	test: use test backend in most remaining tests too	2023-09-24 21:24:01 -07:00
test_git.rs	git: on deserialize/import/export, copy refs/heads/* to remote named "git"	2023-10-07 19:33:35 +09: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	testutils: delete bool-typed init() in favor of enum-typed version	2023-09-18 07:15:37 -07: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: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
test_local_working_copy_concurrent.rs	working_copy: rename to local_working_copy	2023-10-07 08:19:03 -07:00
test_local_working_copy_sparse.rs	working_copy: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
test_merge_trees.rs	test: use test backend in most remaining tests too	2023-09-24 21:24:01 -07:00
test_merged_tree.rs	tree: simplify conflict before resolving at hunk level	2023-09-27 22:14:39 -07:00
test_mut_repo.rs	tests: test views, operations, and mutable repos only with test backend	2023-09-20 07:47:30 -07: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	git: look up "git" remote branches normally	2023-10-07 19:33:35 +09:00
test_rewrite.rs	test: use test backend in most remaining tests too	2023-09-24 21:24:01 -07:00
test_view.rs	tests: test views, operations, and mutable repos only with test backend	2023-09-20 07:47:30 -07:00
test_workspace.rs	test: use test backend in most remaining tests too	2023-09-24 21:24:01 -07:00