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

store: rename Store to Backend and StoreWrapper to Store

2021-09-12 12:02:10 -07:00

test_commit_builder.rs

evolution: don't create pruned commits (#32)

2021-10-06 23:20:23 -07:00

test_commit_concurrent.rs

store: rename Store to Backend and StoreWrapper to Store

2021-09-12 12:02:10 -07:00

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

store: rename Store to Backend and StoreWrapper to Store

2021-09-12 12:02:10 -07:00

test_git.rs

git: don't update public heads for now

2021-10-20 14:23:58 -07:00

test_index.rs

MutableRepo: accept just CommitId instead of whole Commit where possible

2021-09-29 10:13:32 -07:00

test_init.rs

store: rename Store to Backend and StoreWrapper to Store

2021-09-12 12:02:10 -07:00

test_load_repo.rs

MutableRepo: accept just CommitId instead of whole Commit where possible

2021-09-29 10:13:32 -07:00

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

evolution: delete it now that we don't use it anymore (#32)

2021-10-06 23:28:30 -07:00

test_refs.rs

tests: use CommitGraphBuilder in test_refs.rs

2021-08-18 09:58:44 -07:00

test_revset_graph_iterator.rs

revset graph: make order of edges stable

2021-10-23 20:33:59 -07:00

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_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

tests: update a test to not point a branch to an unreachable commit

2021-10-02 23:08:45 -07:00

test_working_copy_concurrent.rs

store: rename Store to Backend and StoreWrapper to Store

2021-09-12 12:02:10 -07:00

test_working_copy.rs

working_copy: preserve conflicts in the working copy until markers are removed

2021-11-07 15:17:51 -08:00