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

duplicate: add --destination, --insert-before, and --insert-after options #3817

Merged
merged 3 commits into from
Nov 15, 2024
Merged

duplicate: add --destination, --insert-before, and --insert-after options #3817

merged 3 commits into from
Nov 15, 2024

Conversation

bnjmnt4n
Copy link
Member

@bnjmnt4n bnjmnt4n commented Jun 3, 2024 •
edited
Loading

This PR is stacked on #4656.

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

@bnjmnt4n bnjmnt4n assigned bnjmnt4n and unassigned bnjmnt4n Jun 3, 2024
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch 2 times, most recently from d415cd6 to 65293d2 Compare October 16, 2024 10:20
@bnjmnt4n bnjmnt4n changed the base branch from main to bnjmnt4n/push-zlrppuytmrxs October 16, 2024 10:20
@bnjmnt4n bnjmnt4n marked this pull request as ready for review October 16, 2024 10:21
ilyagr
ilyagr reviewed Oct 16, 2024
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-zlrppuytmrxs branch from 0a83d6a to 6a55e1e Compare October 17, 2024 08:31
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch 2 times, most recently from 4107fab to a1d572d Compare October 17, 2024 12:56
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-zlrppuytmrxs branch from 6a55e1e to ccee5c6 Compare October 17, 2024 12:56
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch from a1d572d to d4f18ad Compare October 19, 2024 10:51
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-zlrppuytmrxs branch 2 times, most recently from e11021b to 45cceab Compare October 19, 2024 11:02
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch 2 times, most recently from 63deef4 to 8969d30 Compare October 19, 2024 11:26
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-zlrppuytmrxs branch from 45cceab to 1782649 Compare October 22, 2024 11:02
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch from 8969d30 to 84f8311 Compare October 22, 2024 11:02
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-zlrppuytmrxs branch from 1782649 to ead1802 Compare October 22, 2024 12:19
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch from 84f8311 to 7913a71 Compare October 22, 2024 12:19
Base automatically changed from bnjmnt4n/push-zlrppuytmrxs to main October 22, 2024 12:39
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch from 7913a71 to 76654a2 Compare October 22, 2024 12:42
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch from 76654a2 to 7b3038e Compare October 29, 2024 16:20
martinvonz
martinvonz reviewed Nov 4, 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.

Thanks! Sorry about the very slow review of this. I've been unusually busy with internal things at work lately.

lib/src/rewrite.rs Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch 5 times, most recently from 68500de to 212d0b4 Compare November 13, 2024 06:58
yuja
yuja approved these changes Nov 13, 2024
View reviewed changes
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of rebased children is hard to understand, but it seemed correct to rebase them on top of the duplicated heads. LGTM, thanks!

cli/src/commands/duplicate.rs Outdated Show resolved Hide resolved
cli/src/commands/duplicate.rs Outdated Show resolved Hide resolved
cli/src/commands/duplicate.rs Outdated Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
lib/src/rewrite.rs Outdated Show resolved Hide resolved
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch 4 times, most recently from d3b9d00 to 5116038 Compare November 13, 2024 17:18
@bnjmnt4n bnjmnt4n force-pushed the bnjmnt4n/push-qvxvvpxkrtoz branch from 5116038 to 7dc61aa Compare November 15, 2024 11:32
@bnjmnt4n bnjmnt4n enabled auto-merge (rebase) November 15, 2024 11:36
@bnjmnt4n bnjmnt4n merged commit 5a793f6 into main Nov 15, 2024
31 checks passed
@bnjmnt4n bnjmnt4n deleted the bnjmnt4n/push-qvxvvpxkrtoz branch November 15, 2024 11:42
@PhilipMetzger PhilipMetzger mentioned this pull request Dec 18, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ilyagr ilyagr ilyagr left review comments

@martinvonz martinvonz martinvonz left review comments

@yuja yuja yuja 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 @yuja @martinvonz @ilyagr