Martin von Zweigbergk 5ef0be73c1 merged_tree: allow building trees with variable-arity overrides ...

When restoring (`jj restore`) a 3-sided conflict from one tree into a
2-sided tree (or a resolved tree), we'll need to extend the size arity
of the target tree to that of the source tree. I had not considered
this case before. This patch relaxes the constraint in
`MergedTreeBuilder` to allow such cases. The additional trees are
based on empty trees with only the larger overrides in them.

2023-09-01 06:09:37 -07:00

..

benches

cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib

2023-07-09 06:40:43 +02:00

gen-protos

Use { workspace = true } to appease VS Code's Cargo.toml parser

2023-08-22 21:38:53 -07:00

src

merged_tree: allow building trees with variable-arity overrides

2023-09-01 06:09:37 -07:00

tests

merged_tree: allow building trees with variable-arity overrides

2023-09-01 06:09:37 -07:00

testutils

tests: leverage create_tree() in a few more tests

2023-08-30 19:58:42 -07:00

Cargo.toml

merged_tree: add diff iterator

2023-08-25 06:40:36 -07:00