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

rebase: rewrite rebase_revision to use transform_descendants #3551

Merged
merged 3 commits into from
Apr 22, 2024
Merged

rebase: rewrite rebase_revision to use transform_descendants #3551

merged 3 commits into from
Apr 22, 2024

Conversation

bnjmnt4n
Copy link
Member

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@martinvonz
Copy link
Member

To fix the failing tests, you'll probably just need to do something similar to what I did in fe57602

@martinvonz
Copy link
Member

To fix the failing tests, you'll probably just need to do something similar to what I did in fe57602

Oh, this is of course instead related to what you asked about on discord, i.e. that jj rebase -r does its own ancestor simplification that I didn't think to remove in #3080. A good first step seem to be to call rewriter.simplify_ancestor_merge() then. Then follow up with another commit (in this PR or a separate one) to change that behavior.

@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-lttttsmlprxp branch 2 times, most recently from 46167d7 to 69cdf65 Compare April 21, 2024 16:04
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-lttttsmlprxp branch from 69cdf65 to cc677ec Compare April 21, 2024 16:09
bnjmnt4n added 2 commits April 22, 2024 02:11
@bnjmnt4n
rebase: modify tests to avoid a future ancestor merge with root commit
83f39e3 
I will be updating `rebase -r` to avoid simplifying ancestor merges in a
subsequent commit, which will cause existing tests to fail for the Git
backend due to ancestor merges with the root commit.
@bnjmnt4n
rebase: do not simplify ancestor merges
ff249d1
@bnjmnt4n bnjmnt4n marked this pull request as ready for review April 21, 2024 18:16
martinvonz
martinvonz approved these changes Apr 21, 2024
View reviewed changes
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Thanks for cleaning up.

@bnjmnt4n bnjmnt4n merged commit e14ee8b into main Apr 22, 2024
16 checks passed
@bnjmnt4n bnjmnt4n deleted the bnjmnt4n/push-lttttsmlprxp branch April 22, 2024 13:05
This was referenced Apr 23, 2024
Closed
Closed
jimyacton
jimyacton reviewed May 7, 2024
View reviewed changes
Copy link

@jimyacton jimyacton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jimyacton jimyacton jimyacton left review comments

@martinvonz martinvonz martinvonz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bnjmnt4n @martinvonz @jimyacton