forked from mirrors/jj
94501131ac
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. |
||
|---|---|---|
| .. | ||
| common | ||
| smoke_test.rs | ||
| test_alias.rs | ||
| test_branch_command.rs | ||
| test_checkout.rs | ||
| test_concurrent_operations.rs | ||
| test_describe_command.rs | ||
| test_diff_command.rs | ||
| test_edit_command.rs | ||
| test_git_clone.rs | ||
| test_git_colocated.rs | ||
| test_git_push.rs | ||
| test_git_remotes.rs | ||
| test_gitignores.rs | ||
| test_global_opts.rs | ||
| test_init_command.rs | ||
| test_interdiff_command.rs | ||
| test_log_command.rs | ||
| test_move_command.rs | ||
| test_new_command.rs | ||
| test_obslog_command.rs | ||
| test_operations.rs | ||
| test_print_command.rs | ||
| test_rebase_command.rs | ||
| test_restore_command.rs | ||
| test_sparse_command.rs | ||
| test_split_command.rs | ||
| test_squash_command.rs | ||
| test_touchup_command.rs | ||
| test_undo.rs | ||
| test_unsquash_command.rs | ||
| test_untrack_command.rs | ||
| test_workspaces.rs | ||