Cancel pending commit before starting on root #15424
Merged
+9
−17
Conversation
This file contains hidden or 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
Moves the cancelTimeout call to right before creating a new work-in- progress root. Fixes a class of bugs where a pending commit is not cancelled, causing an incomplete tree to accidentally commit. In the interest of fixing downstream bugs quickly, I'm landing this without a test case; I'll add one in a follow up.
acdlite
commented
Apr 15, 2019
| }); | ||
| }); | ||
|
|
||
| // TODO: |
Collaborator
Author
There was a problem hiding this comment.
This is unrelated. I happened to notice them now. Deleting these todos because they are outdated.
Collaborator
Author
|
Got a verbal approval from @bvaughn to land this as he was packing up to leave |
|
What does ’“leave” mean ? |
Contributor
|
Sometimes after working 8 or 9 hours, I go home to rest. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Moves the cancelTimeout call to right before creating a new work-in-progress root. Fixes a class of bugs where a pending commit is not cancelled, causing an incomplete tree to accidentally commit.
In the interest of fixing downstream bugs quickly, I'm landing this without a test case; I'll add one in a follow up.