mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-27 23:06:45 +00:00
8738421990
Now that we have our own representation of branches and tags, let's update them when we import git refs. The View object's git refs are now just a record of what the refs are in the underlying git ref last time we imported them (we don't -- and won't -- provide a way for the user to update our record of the git refs). We can therefore do a nice 3-way ref-merge using the `refs` module we added recently. That means that we'll detect conflicts caused by changes made concurrently in the underlying git repo and in jj's view. |
||
|---|---|---|
| .. | ||
| test_bad_locking.rs | ||
| test_commit_builder.rs | ||
| test_commit_concurrent.rs | ||
| test_diff_summary.rs | ||
| test_evolution.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_view.rs | ||
| test_working_copy.rs | ||
| test_working_copy_concurrent.rs | ||