ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib/tests
Martin von Zweigbergk 8738421990 git: update own branch and tag records based on git refs
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.
2021-08-04 11:39:07 -07:00
..
test_bad_locking.rs
test_commit_builder.rs
test_commit_concurrent.rs
test_diff_summary.rs
test_evolution.rs
test_git.rs git: update own branch and tag records based on git refs 2021-08-04 11:39:07 -07:00
test_index.rs
test_init.rs
test_load_repo.rs
test_merge_trees.rs
test_mut_repo.rs view: rename insert_git_ref() to set_git_ref() 2021-08-04 08:45:37 -07:00
test_operations.rs
test_refs.rs
test_revset.rs view: rename insert_git_ref() to set_git_ref() 2021-08-04 08:45:37 -07:00
test_revset_graph_iterator.rs
test_view.rs view: add support for ref-based branches and tags to model 2021-08-04 11:33:57 -07:00
test_working_copy.rs
test_working_copy_concurrent.rs