forked from mirrors/jj
38180555de
When there are concurrent operations that want to update the working copy, it's useful to know which operation was the last to successfully update the working copy. That can help use decide how to resolve a mismatch between the repo view's record and the working copy's record. If we detect such a difference, we can look at the working copy's operation ID to see if it was updated by an operation before or after we loaded the repo. If the working copy's record says that it was updated at operation A and we have loaded the repo at operation B (after A), we know that the working copy is stale, so we can automatically update it (or tell the user to run some command to update it if we think that's more user-friendly). Conversely, if we have loaded the repo at operation A and the working copy's record says that it was updated at operation B, we know that there was some concurrent operation that updated it. We can then decide to print a warning telling the user that we skipped updating because of the conflict. We already have logic for not updating the working copy if the repo is loaded at an earlier operation, but maybe we can drop that if we record the operation in the working copy (as this patch does). |
||
|---|---|---|
| .. | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_conflicts.rs | ||
| test_diff_summary.rs | ||
| test_git.rs | ||
| test_index.rs | ||
| test_init.rs | ||
| test_load_repo.rs | ||
| test_merge_trees.rs | ||
| test_mut_repo.rs | ||
| test_operations.rs | ||
| test_refs.rs | ||
| test_revset.rs | ||
| test_revset_graph_iterator.rs | ||
| test_rewrite.rs | ||
| test_view.rs | ||
| test_working_copy.rs | ||
| test_working_copy_concurrent.rs | ||
| test_workspace.rs | ||