ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib/tests
Martin von Zweigbergk e901a4e66b repo: don't materialize conflicts on checkout
Since the working copy can now handle conflicts, we don't need to
materialize conflicts when checking out a commit.

Before this patch, we used to create a new commit on top whenever we
checked out a commit with conflicts. That new commit was intended just
for resolving the conflicts. The typical workflow was the resolve the
conflicts and then amend. To use the same workflow after this patch,
one needs to explicitly create a new commit on top with `jj new` after
checking out a commit with conflict.
2021-11-07 15:17:51 -08:00
..
test_bad_locking.rs
test_commit_builder.rs
test_commit_concurrent.rs
test_conflicts.rs working_copy: preserve conflicts in the working copy until markers are removed 2021-11-07 15:17:51 -08:00
test_diff_summary.rs
test_git.rs
test_index.rs
test_init.rs
test_load_repo.rs
test_merge_trees.rs trees: try to resolve file conflicts after simplifying conflicts 2021-10-22 09:20:50 -07:00
test_mut_repo.rs repo: don't materialize conflicts on checkout 2021-11-07 15:17:51 -08:00
test_operations.rs
test_refs.rs
test_revset.rs view: don't force commits pointed to by refs to be current heads 2021-10-23 09:15:05 -07:00
test_revset_graph_iterator.rs revset graph: make order of edges stable 2021-10-23 20:33:59 -07:00
test_rewrite.rs view: don't force commits pointed to by refs to be current heads 2021-10-23 09:15:05 -07:00
test_view.rs
test_working_copy.rs working_copy: preserve conflicts in the working copy until markers are removed 2021-11-07 15:17:51 -08:00
test_working_copy_concurrent.rs