git: Compute and synchronize diffs from HEAD #23626
Merged
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
cla-bot
bot
added
the
cla-signed
cole-miller
force-pushed
the
cole/change-diff-base
branch
from
76bfcfa to
610f5dd
Compare
Co-authored-by: Max <[email protected]>
Co-authored-by: Max <[email protected]>
Co-authored-by: Ben <[email protected]> Co-authored-by: maxbrunsfeld <[email protected]>
Co-authored-by: maxbrunsfeld <[email protected]>
Co-authored-by: maxbrunsfeld <[email protected]> Co-authored-by: Ben <[email protected]>
Co-authored-by: maxbrunsfeld <[email protected]> Co-authored-by: Ben <[email protected]>
Co-authored-by: maxbrunsfeld <[email protected]> Co-authored-by: Ben <[email protected]>
Co-authored-by: maxbrunsfeld <[email protected]> Co-authored-by: Ben <[email protected]>
cole-miller
changed the title
Co-authored-by: Max <[email protected]>
Co-authored-by: Max <[email protected]>
Co-authored-by: Max <[email protected]>�
maxbrunsfeld
force-pushed
the
cole/change-diff-base
branch
from
f52b22f to
3e9b19e
Compare
Co-authored-by: Cole <[email protected]>
Co-authored-by: Cole <[email protected]>
Co-authored-by: Max <[email protected]>
Co-authored-by: Max <[email protected]>
Co-authored-by: Max <[email protected]>
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Conrad <[email protected]>
|
Probobuf check is expected to fail due to not understanding message renames. |
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.
This PR builds on #21258 to make it possible to use HEAD as a diff base. The buffer store is extended to support holding multiple change sets, and collab gains support for synchronizing the committed text of files when any collaborator requires it.
Not implemented in this PR:
test_random_multibuffernow fails first atSEED=13277, similar to the previous high-water mark, but with various bugs in the multibuffer logic now shaken out.Release Notes: