Martin von Zweigbergk 94501131ac cli: when merging concurrent operations, snapshot afterwards ... It seems simpler to do the snapshotting after merging any concurrent operations instead of snapshotting on top of one of the operations, especially since the attempt to snapshot may end up noticing that the working copy is stale. More importantly, snapshotting before resolving operations resulted in a crash if the working copy was modified. That happened because we held a lock on the operation heads (`locked_op_heads`) while we tried to record the operation committing the working copy. I noticed this only after adding the test.		2022-10-12 06:22:38 -07:00
..
common	tests: use testutils::new_temp_dir() thoroughly	2022-09-07 23:49:46 +09:00
smoke_test.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_alias.rs	cli: make jj branch take subcommands, not flags	2022-06-06 09:02:56 -07:00
test_branch_command.rs	cli: make jj branch take subcommands, not flags	2022-06-06 09:02:56 -07:00
test_checkout.rs	cli: disable open commits by default	2022-08-26 23:34:52 -07:00
test_concurrent_operations.rs	cli: when merging concurrent operations, snapshot afterwards	2022-10-12 06:22:38 -07:00
test_describe_command.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
test_diff_command.rs	diff: make sure word diff print final newline	2022-07-07 23:29:18 +09:00
test_edit_command.rs	cli: add jj edit for editing a commit in the wokring copy	2022-07-01 08:58:08 +08:00
test_git_clone.rs	cli: check that clone target is an empty dir if it exists	2022-07-01 09:03:24 +08:00
test_git_colocated.rs	cli: make jj branch take subcommands, not flags	2022-06-06 09:02:56 -07:00
test_git_push.rs	cli: on push, indicate which branches we're going to force-push	2022-09-27 02:23:05 -07:00
test_git_remotes.rs	cli: add a command for listing git remotes and their URLs	2022-04-29 14:08:24 -07:00
test_gitignores.rs
test_global_opts.rs	cli: remind the user to configure their name and email	2022-10-09 21:24:05 -07:00
test_init_command.rs	cleanup: automated fixes by new Clippy version	2022-10-09 12:20:15 -07:00
test_interdiff_command.rs	conflicts: change diff line marker to %%%%%%%	2022-09-20 15:26:29 +09:00
test_log_command.rs	add default log revset configuration setting	2022-10-02 16:56:18 +09:00
test_move_command.rs	cli: make jj move/squash/unsquash ask for combined description	2022-08-30 21:41:26 -07:00
test_new_command.rs	cli: fix crash on "jj merge whatever root"	2022-09-01 13:36:17 +09:00
test_obslog_command.rs	conflicts: change diff line marker to %%%%%%%	2022-09-20 15:26:29 +09:00
test_operations.rs	graphlog: don't de-indent multi-line text at end of chain	2022-05-11 04:42:44 -07:00
test_print_command.rs	conflicts: change diff line marker to %%%%%%%	2022-09-20 15:26:29 +09:00
test_rebase_command.rs	Fix rebase -r of a parent of a merge commit	2022-09-12 12:23:21 -07:00
test_restore_command.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_sparse_command.rs	tests: re-run with insta crate version b9d99e87065b	2022-04-28 16:55:10 -07:00
test_split_command.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_squash_command.rs	tests: use jj new instead of jj merge in tests	2022-08-31 07:51:32 -07:00
test_touchup_command.rs	conflicts: change diff line marker to %%%%%%%	2022-09-20 15:26:29 +09:00
test_undo.rs	cli: show placeholder text for empty commit message	2022-05-18 09:16:04 -07:00
test_unsquash_command.rs	tests: use jj new instead of jj merge in tests	2022-08-31 07:51:32 -07:00
test_untrack_command.rs	cli: disallow initializing repo with native backend by default	2022-10-09 01:00:03 -07:00
test_workspaces.rs	cleanup: rename checkout to wc_commit	2022-09-18 16:19:58 -07:00