Martin von Zweigbergk 2bc641c57c test_bad_locking: make merge_directories() expect non-existent target ... I ran into some issues here when switching our tests to use `.jj`-internal git repos. For example, the `std::fs::copy()` calls started failing, which may be related to #2103. I think one problem is that we could end up calling `merge_directories()` twice for the same directory. This patch fixes that by deduping the paths we call with, and makes the function assume that the output directory doesn't exist.		2023-09-18 06:59:28 -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	repo_path: avoid repeated copying of PathBuf in to_fs_path()	2023-09-09 08:43:29 -07:00
tests	test_bad_locking: make merge_directories() expect non-existent target	2023-09-18 06:59:28 -07:00
testutils	tests: leverage create_tree() in a few more tests	2023-08-30 19:58:42 -07:00
Cargo.toml	merged_tree: add diff iterator	2023-08-25 06:40:36 -07:00