Allow simultaneous rebasing of duplicate commits, duplicating multiple commits, undo after duplicate #1049
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 tasks
|
I made this a draft until I figure out whether we can fix #1050 or I should work around it by not using Update: Martin helped me fix the bug. Thank you! |
ilyagr
changed the title
ilyagr
force-pushed
the
ig/rebase-dup
branch
2 times, most recently
from
e6aca27 to
549acce
Compare
ilyagr
force-pushed
the
ig/rebase-dup
branch
8 times, most recently
from
2fa1275 to
cadb2fe
Compare
martinvonz
reviewed
Jan 16, 2023
ilyagr
force-pushed
the
ig/rebase-dup
branch
7 times, most recently
from
20d885a to
adec189
Compare
ilyagr
force-pushed
the
ig/rebase-dup
branch
7 times, most recently
from
cd1d0ab to
41e6d5a
Compare
ilyagr
commented
Jan 17, 2023
martinvonz
reviewed
Jan 17, 2023
Fixes #1050 Thanks to Martin for suggesting the exact fix. The tests go into the new tests/test_duplicate_command.rs, which will be expanded shortly with other tests depending on this bugfix.
The `indexmap` crate is used to make `duplicate`'s output have a sane order, making it easier to test. It's also used later to remove duplicate revisions in the `abandon` command.
martinvonz
approved these changes
Jan 18, 2023
|
Thank you for the review and the help! :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #27, #694 and #1050
I combined the bugfix PRs with the feature PR into one since they are both ready. If a portion of this PR gets a faster review than the rest, I'll split them again.
Now also includes a minor fix to
jj abandon: if the same revision is specified several times, it is now only listed once in the output.Checklist
If applicable:
CHANGELOG.md