Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

essiene
Copy link
Collaborator

@essiene essiene commented Nov 19, 2024

Summary

  • Get branch pre-fetch heads
  • Build candidates from prefetch heads
  • Fetch from remotes
  • Get branch post-fetch heads
  • Rebase
    • Build old -> new map
    • 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

@essiene essiene force-pushed the essiene/movllvxqpxom branch from 650d852 to 61ab0ea Compare November 19, 2024 02:06
@essiene essiene force-pushed the essiene/rmswqswouoxv branch 2 times, most recently from 5aa7ed0 to 9c1e992 Compare November 19, 2024 12:53
@essiene essiene force-pushed the essiene/movllvxqpxom branch from 61ab0ea to 8e33eeb Compare November 19, 2024 12:53
@essiene essiene force-pushed the essiene/rmswqswouoxv branch from 9c1e992 to 2bec61f Compare November 19, 2024 14:06
@essiene essiene force-pushed the essiene/movllvxqpxom branch 2 times, most recently from e56c29a to c614fe8 Compare November 19, 2024 14:15
@essiene essiene force-pushed the essiene/rmswqswouoxv branch from 2bec61f to 6caacf5 Compare November 19, 2024 14:15
@essiene essiene force-pushed the essiene/movllvxqpxom branch from c614fe8 to 7cd1059 Compare November 19, 2024 14:29
@essiene essiene force-pushed the essiene/rmswqswouoxv branch from 6caacf5 to 0f0217b Compare November 19, 2024 14:29
@essiene essiene force-pushed the essiene/movllvxqpxom branch from 7cd1059 to c760f6b Compare November 19, 2024 18:31
@essiene essiene force-pushed the essiene/rmswqswouoxv branch from 0f0217b to 408d372 Compare November 19, 2024 18:31
@essiene
git sync: Rebase commits onto new branch heads.
e712738 
## 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
@essiene essiene force-pushed the essiene/rmswqswouoxv branch from 408d372 to e712738 Compare November 23, 2024 10:35
@essiene essiene force-pushed the essiene/movllvxqpxom branch from c760f6b to 4fd5a23 Compare November 23, 2024 10:35
@essiene essiene closed this Nov 23, 2024
@essiene essiene deleted the essiene/rmswqswouoxv branch November 23, 2024 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@essiene