Martin von Zweigbergk b54ace4954 rewrite: mark divergent commits in parent_mapping too ... When rebasing descendants, we generally move branches, child commits, the working copy to the rewritten commit(s). However, we don't move the working copy to the new rewritten commit (s) if the old commit had been abandoned, and we don't move child commits if the rewriten was divergent. This patch aims to make it clearer that there's only one mapping from old to new parents, and that is in `parent_mapping`. It does so by merging the current `divergent` map into it, and makes the `divergent` just a set instead. When finding the new parents for a child, we leave the existing parent if it's in the set. My longer-term goal is to move `parent_mapping`, `abandoned`, and `divergent` into `MutableRepo` (maybe in a nested struct), so we can do some transformations on descendants as we rebase them. By having the state in a single place (not moving it from `MutableRepo` to `DescendantRebaser` as we currently do), I hope it will be easier to write a `MutableRepo::transform_descendants(callback)`, where the callback gets a `CommitBuilder` and can change parents of the commit, for example.		2024-03-25 06:53:14 -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
proc-macros	cargo: mark the jj-lib-proc-macros crate for publish	2024-03-06 20:35:38 -08:00
src	rewrite: mark divergent commits in parent_mapping too	2024-03-25 06:53:14 -07:00
tests	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
testutils	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
Cargo.toml	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00