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 to dest parent #2514

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Rebase to dest parent #2514

merged 1 commit into from
Nov 3, 2023

Conversation

AntoineCezar
Copy link
Contributor

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

@AntoineCezar AntoineCezar force-pushed the rebase_to_dest_parent branch 2 times, most recently from bf1839b to 89ca02f Compare November 3, 2023 04:48
martinvonz
martinvonz reviewed Nov 3, 2023
View reviewed changes
lib/src/rewrite.rs Outdated Show resolved Hide resolved
@AntoineCezar AntoineCezar force-pushed the rebase_to_dest_parent branch from 89ca02f to 3a24e27 Compare November 3, 2023 16:14
@AntoineCezar AntoineCezar marked this pull request as ready for review November 3, 2023 16:14
@AntoineCezar AntoineCezar enabled auto-merge (rebase) November 3, 2023 16:16
@AntoineCezar AntoineCezar force-pushed the rebase_to_dest_parent branch from 3a24e27 to bed6a14 Compare November 3, 2023 16:50
martinvonz
martinvonz approved these changes Nov 3, 2023
View reviewed changes
lib/src/rewrite.rs Show resolved Hide resolved
@AntoineCezar
commands: move rebase_to_dest_parent to jj_lib::rewrite
7c778ae 
What make rebase_to_dest_parent a good candidate for jj_lib::rewrite module:

- It is used both in obslog and interdiff. It's a sign that it may be moved to a lower layer
- CommandError is returned by converting from TreeMergeError. Not explicitly.
- It only use jj_lib::rewrite fonctions.
@AntoineCezar AntoineCezar force-pushed the rebase_to_dest_parent branch from bed6a14 to 7c778ae Compare November 3, 2023 18:00
@AntoineCezar AntoineCezar merged commit 5973ab4 into main Nov 3, 2023
14 checks passed
@AntoineCezar AntoineCezar deleted the rebase_to_dest_parent branch November 3, 2023 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@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.
2 participants
@AntoineCezar @martinvonz