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

jj rebase --after does not maintain order of parents #3969

Closed
mlcui-corp opened this issue Jun 26, 2024 · 0 comments
Closed

jj rebase --after does not maintain order of parents #3969

mlcui-corp opened this issue Jun 26, 2024 · 0 comments
Labels
🐛bug Something isn't working

Comments

@mlcui-corp
Copy link
Collaborator

mlcui-corp commented Jun 26, 2024

Steps to Reproduce the Problem

$ jj
@    qont three (merge)
├─╮
│ ○  tpzo two
○ │  wouy one
├─╯
│ ○  vzkp four
├─╯

$ jj rebase -r v --after w
Rebased 1 commits onto destination
Rebased 1 descendant commits
Working copy now at: qont three (merge)
Parent commit      : tpzo two
Parent commit      : vzkp four

$ jj
@    qont three (merge)
├─╮
│ ○  vzkp four
│ ○  wouy one
○ │  tpzo two
├─╯

Expected Behavior

@ has parents four (vzkp), then two (tpzo).

Actual Behavior

@ has parents two (tpzo), then four (vzkp).

Specifications

@PhilipMetzger PhilipMetzger added the 🐛bug Something isn't working label Jun 26, 2024
bnjmnt4n added a commit that referenced this issue Aug 14, 2024
When rebasing a new child commit on top of the moved commit(s), the
order of the new child commit's parent commits is now correctly
preserved if the original parent commit is now a parent of the moved
commit(s).

Closes #3969.
bnjmnt4n added a commit that referenced this issue Aug 14, 2024
When rebasing a new child commit on top of the moved commit(s), the
order of the new child commit's parent commits is now correctly
preserved if the original parent commit is now a parent of the moved
commit(s).

Closes #3969.
bnjmnt4n added a commit that referenced this issue Aug 14, 2024
When rebasing a new child commit on top of the moved commit(s), the
order of the new child commit's parent commits is now correctly
preserved if the original parent commit is now a parent of the moved
commit(s).

Closes #3969.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐛bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants