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

squash: preserve the working copy position in the tree #4472

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

samueltardieu
Copy link
Collaborator

When a squashed working copy commit is emptied and abandoned, the newly created working copy will keep the same parents and children as the previous one.

Note that this does not change the result of any existing test.

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

Fix #4468

@martinvonz
Copy link
Owner

I think we would first need to address @yuja's comment on the tracking issue about abandoning the working copy when you move off of it.

@samueltardieu
Copy link
Collaborator Author

I think we would first need to address @yuja's comment on the tracking issue about abandoning the working copy when you move off of it.

Agreed, which is why I put it in draft mode right now. I've yet to come with an acceptable solution.

@samueltardieu samueltardieu force-pushed the squash-preserve-position branch 2 times, most recently from 9900f93 to d7160f8 Compare September 16, 2024 22:14
When a squashed working copy commit is emptied and abandoned, the newly
created working copy will keep the same parents and children as the
previous one.
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.

FR: when abandoning the working copy, use the same children for the new change
2 participants