squash: preserve the working copy position in the tree #4472
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
samueltardieu
force-pushed
the
squash-preserve-position
branch
from
b816723
to
7b62c14
Compare
samueltardieu
force-pushed
the
squash-preserve-position
branch
from
7b62c14
to
2ad577e
Compare
|
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
force-pushed
the
squash-preserve-position
branch
from
2ad577e
to
9900f93
Compare
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.
samueltardieu
force-pushed
the
squash-preserve-position
branch
from
9900f93
to
d7160f8
Compare
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.
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:
CHANGELOG.mdFix #4468