Martin von Zweigbergk b80c39d77c view: test that merging divergent rewrites results in both commits visible ...

It seems that we didn't have a test for this simple case. I wrote this
test case while working on #111 but I don't know why I didn't push it
back then.

2022-12-01 19:20:38 -08:00

..

test_bad_locking.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_commit_builder.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_commit_concurrent.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_conflicts.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_diff_summary.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_git.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_index.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_init.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_load_repo.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_merge_trees.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_mut_repo.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_operations.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_refs.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_revset_graph_iterator.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_revset.rs

revset: add unary negate (or set complement) operator '~y'

2022-11-29 15:46:15 +09:00

test_rewrite.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_view.rs

view: test that merging divergent rewrites results in both commits visible

2022-12-01 19:20:38 -08:00

test_working_copy_concurrent.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_working_copy_sparse.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00

test_working_copy.rs

git: do not delete or track git submodules.

2022-12-01 23:14:55 +05:30

test_workspace.rs

copyright: change from "Google LLC" to "The Jujutsu Authors"

2022-11-28 06:05:45 -10:00