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

test_abandon_command: test we don't create commits that are both direct and indirect descendants #2601

Merged
merged 2 commits into from
Nov 20, 2023

Conversation

ilyagr
Copy link
Contributor

@ilyagr ilyagr commented Nov 19, 2023

Illustrates #2600, in addition to being IMO a useful test.

This is similar to the following test:

https://github.com/martinvonz/jj/blob/5186066cf5064564466e58096b79fba6b0c0ecfd/cli/tests/test_rebase_command.rs#L264-L269

from #538.

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

@ilyagr ilyagr marked this pull request as ready for review November 19, 2023 23:44
@ilyagr ilyagr changed the title test_abandon_command: test we don't create commits that are both dire… …ct and indirect descendants test_abandon_command: test we don't create commits that are both direct and indirect descendants Nov 19, 2023
@ilyagr ilyagr force-pushed the testabandon branch 2 times, most recently from 2a15ff3 to 6bd7483 Compare November 19, 2023 23:56
@ilyagr ilyagr merged commit 22ad4d7 into jj-vcs:main Nov 20, 2023
15 checks passed
@ilyagr ilyagr deleted the testabandon branch November 20, 2023 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants