ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib
Matt Stark a4aed2391f Rewrite instead of abandoning empty commits.
Fixes #2760


Given the tree:
```
A-B-C
 \
  B2
```
And the command `jj rebase -s B -d B2`

We were previously marking B as abandoned, despite the comment stating that we were marking it as being succeeded by B2. This resulted in a call to `rewrite(rewrites={}, abandoned={B})` instead of `rewrite(rewrites={B=>B2}, abandoned={})`, which then made the new parent of `C` into `A` instead of `B2`
2024-01-04 13:33:24 +11:00
..
benches
gen-protos
src Rewrite instead of abandoning empty commits. 2024-01-04 13:33:24 +11:00
tests Rewrite instead of abandoning empty commits. 2024-01-04 13:33:24 +11:00
testutils test_rewrite.rs: stop using DescendantRebaser when testing EmptyBehavior 2024-01-01 18:51:36 -08:00
Cargo.toml lock: remove byteorder dependency from tests, use fs helper functions 2023-12-23 00:14:17 +09:00
LICENSE