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.

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

rebase: rewrite rebase_revision to use transform_descendants #3551

Merged
merged 3 commits into from
Apr 22, 2024

Conversation

bnjmnt4n
Copy link
Collaborator

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
Owner

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

@martinvonz
Copy link
Owner

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
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 bnjmnt4n marked this pull request as ready for review April 21, 2024 18:16
Copy link
Owner

@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.

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants