forked from mirrors/jj
dabfd04da6
We resolve checkouts in favor of the first-committed operation (which is more likely to have managed to update the working copy). The test case has been flaky on GitHub lately. I've run it 1000 times on my machine without failure. I don't know if GitHub's machines are just faster in some way (SSD, maybe) that makes them finish the two operations in the test in the same millisecond. Let's add a 1-millisecond sleep to see if that helps. If it doesn't, then maybe the issue is that the clock has lower precision (or their clocks can go backwards?). |
||
|---|---|---|
| .. | ||
| 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 | ||