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
..
benches	cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib	2023-07-09 06:40:43 +02:00
gen-protos	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
src	working_copy: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
tests	working_copy: don't crash when updating and tracked file exits on disk	2023-10-07 14:02:31 -07:00
testutils	working_copy: rename to local_working_copy	2023-10-07 08:19:03 -07:00
Cargo.toml	merged_tree: add diff iterator	2023-08-25 06:40:36 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00