git sync: Rebase commits onto new branch heads. - Githubissues

martinvonz / jj

A Git-compatible VCS that is both simple and powerful

https://martinvonz.github.io/jj/

Apache License 2.0

9.37k stars 323 forks source link

git sync: Rebase commits onto new branch heads. #4913

Closed essiene closed 2 days ago

essiene commented 1 week ago

Summary

[X] Get branch pre-fetch heads
[X] Build candidates from prefetch heads
[X] Fetch from remotes
[X] Get branch post-fetch heads
[X] Rebase
- [X] Build old -> new map
- [X] transform descendants

Details

implement CommitRewritter::repo() to return an immutable reference.
transform_descendants() roots are candidates with parents in update_record.
simplify parent merge
drop newly emptied commits
update new parents from the updated heads set if the old parents are ancestors.

Issue: #1039