Martin von Zweigbergk 9b59461242 git: add test for concurrent change in git repo between exports ... If you update a branch using regular `git` (or some Git-based tool) between two `jj git export`, we will overwrite that change if you had also changed the branch in jj land. There's a similar problem if you delete the branch in jj land. Let's have a test for that. I'm going to make us not overwrite it soon. This patch adds a test for those cases, plus many other cases in consistent way. Since the new test covers some cases tested by existing tests, I removed those tests.		2022-12-03 09:32:49 -08:00
..
test_bad_locking.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_commit_builder.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_commit_concurrent.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_conflicts.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_diff_summary.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_git.rs	git: add test for concurrent change in git repo between exports	2022-12-03 09:32:49 -08:00
test_index.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_init.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_load_repo.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_merge_trees.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_mut_repo.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_operations.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_refs.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_revset.rs	revset: add unary negate (or set complement) operator '~y'	2022-11-29 15:46:15 +09:00
test_revset_graph_iterator.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_rewrite.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_view.rs	view: test that merging divergent rewrites results in both commits visible	2022-12-01 19:20:38 -08:00
test_working_copy.rs	git: do not delete or track git submodules.	2022-12-01 23:14:55 +05:30
test_working_copy_concurrent.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_working_copy_sparse.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00
test_workspace.rs	copyright: change from "Google LLC" to "The Jujutsu Authors"	2022-11-28 06:05:45 -10:00