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: move_commits: do not remove parents of target commits which are outside the target set #3605

Merged
merged 2 commits into from
Aug 17, 2024
Merged

rebase: move_commits: do not remove parents of target commits which are outside the target set #3605

merged 2 commits into from
Aug 17, 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

yuja
yuja reviewed May 1, 2024
View reviewed changes
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
jonathantanmy
jonathantanmy reviewed May 1, 2024
View reviewed changes
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/tests/test_rebase_command.rs Outdated Show resolved Hide resolved
yuja
yuja reviewed May 2, 2024
View reviewed changes
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
cli/src/commands/rebase.rs Outdated Show resolved Hide resolved
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-nwrmulnsxpou branch from d46b7b7 to 3ca78be Compare May 2, 2024 08:06
@bnjmnt4n bnjmnt4n closed this May 15, 2024
@bnjmnt4n bnjmnt4n deleted the bnjmnt4n/push-nwrmulnsxpou branch May 15, 2024 20:32
@martinvonz martinvonz mentioned this pull request Jun 10, 2024
Open
4 tasks
@bnjmnt4n
Copy link
Member Author

Given @martinvonz's comment on Discord, should I re-open this issue?

@martinvonz
Copy link
Member

Yes, I suspect that's best (for context: what I said on Discord is that I suspect I was wrong when I said -s X and -r X:: should behave differently). I'm not sure how much it matters in practice for cases like the one we discussed above because they seem rare, and I'm not sure what users expect in those cases. However, just the fact that it removes the difference between -s X and -r X:: seems like a strong reason to do it. Sorry to have wasted your time.

@bnjmnt4n bnjmnt4n restored the bnjmnt4n/push-nwrmulnsxpou branch August 16, 2024 13:25
@bnjmnt4n bnjmnt4n reopened this Aug 16, 2024
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-nwrmulnsxpou branch from 3ca78be to 71bf041 Compare August 16, 2024 14:35
martinvonz
martinvonz approved these changes Aug 16, 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.

LGTM. Thanks again!

yuja
yuja reviewed Aug 17, 2024
View reviewed changes
lib/src/rewrite.rs Show resolved Hide resolved
cli/tests/test_rebase_command.rs Show resolved Hide resolved
@bnjmnt4n
rebase: modify tests to include commit's parent branch in log output
2369bac
@bnjmnt4n
rewrite: move_commits: do not remove parents of target commits whic…
94e7b21 
…h are outside the target set

This ensures consistency between the commands `jj rebase -r a::` and `jj
rebase -s a`.
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-nwrmulnsxpou branch from 71bf041 to 94e7b21 Compare August 17, 2024 14:05
@bnjmnt4n bnjmnt4n merged commit f258664 into main Aug 17, 2024
30 checks passed
@bnjmnt4n bnjmnt4n deleted the bnjmnt4n/push-nwrmulnsxpou branch August 17, 2024 15:27
@bnjmnt4n bnjmnt4n mentioned this pull request Oct 17, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonathantanmy jonathantanmy jonathantanmy left review comments

@yuja yuja yuja 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.
4 participants
@bnjmnt4n @martinvonz @yuja @jonathantanmy