Sync from Google internal codebase - DIRTY#169
Draft
s2t2 wants to merge 67 commits into
Draft
Conversation
**Context Reference**: HEAD **Copybara Current Rev**: 752504293 **Summary of Internal Changes:** - 752504293 PiperOrigin-RevId: 752504293
**Context Reference**: HEAD **Copybara Current Rev**: 789883177 **Summary of Internal Changes:** - 789883177 PiperOrigin-RevId: 789883177
**Context Reference**: HEAD **Copybara Current Rev**: 789890907 **Summary of Internal Changes:** - 789890907 PiperOrigin-RevId: 789890907
**Context Reference**: HEAD **Copybara Current Rev**: 791324230 **Summary of Internal Changes:** - 791324230 PiperOrigin-RevId: 791324230
**Context Reference**: HEAD **Copybara Current Rev**: 791661082 **Summary of Internal Changes:** - 791661082 PiperOrigin-RevId: 791661082
**Context Reference**: HEAD **Copybara Current Rev**: 792328341 **Summary of Internal Changes:** - 792328341 PiperOrigin-RevId: 792328341
**Context Reference**: HEAD **Copybara Current Rev**: 792735851 **Summary of Internal Changes:** - 792735851 PiperOrigin-RevId: 792735851
**Context Reference**: HEAD **Copybara Current Rev**: 800440204 **Summary of Internal Changes:** - 800440204 PiperOrigin-RevId: 800440204
**Context Reference**: HEAD **Copybara Current Rev**: 800446972 **Summary of Internal Changes:** - 800446972 PiperOrigin-RevId: 800446972
**Context Reference**: HEAD **Copybara Current Rev**: 810461194 **Summary of Internal Changes:** - 810461194 PiperOrigin-RevId: 810461194
**Context Reference**: HEAD **Copybara Current Rev**: 810462704 **Summary of Internal Changes:** - 810462704 PiperOrigin-RevId: 810462704
**Context Reference**: HEAD **Copybara Current Rev**: 810463179 **Summary of Internal Changes:** - 810463179 PiperOrigin-RevId: 810463179
**Context Reference**: HEAD **Copybara Current Rev**: 821375201 **Summary of Internal Changes:** - 821375201 PiperOrigin-RevId: 821375201
**Context Reference**: HEAD **Copybara Current Rev**: 822167393 **Summary of Internal Changes:** - 822167393 PiperOrigin-RevId: 822167393
**Context Reference**: HEAD **Copybara Current Rev**: 825028392 **Summary of Internal Changes:** - 825028392 PiperOrigin-RevId: 825028392
**Context Reference**: HEAD **Copybara Current Rev**: 831929359 **Summary of Internal Changes:** - 831929359 PiperOrigin-RevId: 831929359
**Context Reference**: HEAD **Copybara Current Rev**: 832304045 **Summary of Internal Changes:** - 832304045 PiperOrigin-RevId: 832304045
**Context Reference**: HEAD **Copybara Current Rev**: 846247764 **Summary of Internal Changes:** - 846247764 PiperOrigin-RevId: 846247764
**Context Reference**: HEAD **Copybara Current Rev**: 846746816 **Summary of Internal Changes:** - 846746816 PiperOrigin-RevId: 846746816
**Context Reference**: HEAD **Copybara Current Rev**: 846751006 **Summary of Internal Changes:** - 846751006 PiperOrigin-RevId: 846751006
**Context Reference**: HEAD **Copybara Current Rev**: 849246715 **Summary of Internal Changes:** - 849246715 PiperOrigin-RevId: 849246715
**Context Reference**: HEAD **Copybara Current Rev**: 851371438 **Summary of Internal Changes:** - 851371438 PiperOrigin-RevId: 851371438
**Context Reference**: HEAD **Copybara Current Rev**: 851704652 **Summary of Internal Changes:** - 851704652 PiperOrigin-RevId: 851704652
**Context Reference**: HEAD **Copybara Current Rev**: 853284425 **Summary of Internal Changes:** - 853284425 PiperOrigin-RevId: 853284425
**Context Reference**: HEAD **Copybara Current Rev**: 855230091 **Summary of Internal Changes:** - 855230091 PiperOrigin-RevId: 855230091
**Context Reference**: HEAD **Copybara Current Rev**: 863293360 **Summary of Internal Changes:** - 863293360 PiperOrigin-RevId: 863293360
**Context Reference**: HEAD **Copybara Current Rev**: 864894384 **Summary of Internal Changes:** - 864894384 PiperOrigin-RevId: 864894384
**Context Reference**: HEAD **Copybara Current Rev**: 865000930 **Summary of Internal Changes:** - 865000930 PiperOrigin-RevId: 865000930
**Context Reference**: HEAD **Copybara Current Rev**: 866044788 **Summary of Internal Changes:** - 866044788 PiperOrigin-RevId: 866044788
**Context Reference**: HEAD **Copybara Current Rev**: 877986592 **Summary of Internal Changes:** - 877986592 PiperOrigin-RevId: 877986592
**Context Reference**: HEAD **Copybara Current Rev**: 885057906 **Summary of Internal Changes:** - 885057906 PiperOrigin-RevId: 885057906
**Context Reference**: HEAD **Copybara Current Rev**: 886193775 **Summary of Internal Changes:** - 886193775 PiperOrigin-RevId: 886193775
**Context Reference**: HEAD **Copybara Current Rev**: 886797361 **Summary of Internal Changes:** - 886797361 PiperOrigin-RevId: 886797361
**Context Reference**: HEAD **Copybara Current Rev**: 886959366 **Summary of Internal Changes:** - 886959366 PiperOrigin-RevId: 886959366
**Context Reference**: HEAD **Copybara Current Rev**: 889550721 **Summary of Internal Changes:** - 889550721 PiperOrigin-RevId: 889550721
**Context Reference**: HEAD **Copybara Current Rev**: 889587541 **Summary of Internal Changes:** - 889587541 PiperOrigin-RevId: 889587541
**Context Reference**: HEAD **Copybara Current Rev**: 891770416 **Summary of Internal Changes:** - 891770416 PiperOrigin-RevId: 891770416
**Context Reference**: HEAD **Copybara Current Rev**: 894173510 **Summary of Internal Changes:** - 894173510 PiperOrigin-RevId: 894173510
**Context Reference**: HEAD **Copybara Current Rev**: 895438694 **Summary of Internal Changes:** - 895438694 PiperOrigin-RevId: 895438694
**Context Reference**: HEAD **Copybara Current Rev**: 896500787 **Summary of Internal Changes:** - 896500787 PiperOrigin-RevId: 896500787
**Context Reference**: HEAD **Copybara Current Rev**: 896662555 **Summary of Internal Changes:** - 896662555 PiperOrigin-RevId: 896662555
**Context Reference**: HEAD **Copybara Current Rev**: 900220335 **Summary of Internal Changes:** - 900220335 PiperOrigin-RevId: 900220335
**Context Reference**: HEAD **Copybara Current Rev**: 900728726 **Summary of Internal Changes:** - 900728726 PiperOrigin-RevId: 900728726
**Context Reference**: HEAD **Copybara Current Rev**: 903299075 **Summary of Internal Changes:** - 903299075 PiperOrigin-RevId: 903299075
**Context Reference**: HEAD **Copybara Current Rev**: 907657120 **Summary of Internal Changes:** - 907657120 PiperOrigin-RevId: 907657120
**Context Reference**: HEAD **Copybara Current Rev**: 908289497 **Summary of Internal Changes:** - 908289497 PiperOrigin-RevId: 908289497
**Context Reference**: HEAD **Copybara Current Rev**: 911318330 **Summary of Internal Changes:** - 911318330 PiperOrigin-RevId: 911318330
**Context Reference**: HEAD **Copybara Current Rev**: 912461663 **Summary of Internal Changes:** - 912461663 PiperOrigin-RevId: 912461663
**Context Reference**: HEAD **Copybara Current Rev**: 912749430 **Summary of Internal Changes:** - 912749430 PiperOrigin-RevId: 912749430
**Context Reference**: HEAD **Copybara Current Rev**: 913445770 **Summary of Internal Changes:** - 913445770 PiperOrigin-RevId: 913445770
**Context Reference**: HEAD **Copybara Current Rev**: 913717838 **Summary of Internal Changes:** - 913717838 PiperOrigin-RevId: 913717838
**Context Reference**: HEAD **Copybara Current Rev**: 913728564 **Summary of Internal Changes:** - 913728564 PiperOrigin-RevId: 913728564
**Context Reference**: HEAD **Copybara Current Rev**: 914431117 **Summary of Internal Changes:** - 914431117 PiperOrigin-RevId: 914431117
**Context Reference**: HEAD **Copybara Current Rev**: 914864384 **Summary of Internal Changes:** - 914864384 PiperOrigin-RevId: 914864384
**Context Reference**: HEAD **Copybara Current Rev**: 915132394 **Summary of Internal Changes:** - 915132394 PiperOrigin-RevId: 915132394
**Context Reference**: HEAD **Copybara Current Rev**: 915420251 **Summary of Internal Changes:** - 915420251 PiperOrigin-RevId: 915420251
**Context Reference**: HEAD **Copybara Current Rev**: 915713647 **Summary of Internal Changes:** - 915713647 PiperOrigin-RevId: 915713647
s2t2
changed the title
s2t2
changed the title
s2t2
changed the title
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 is a sync out from our internal repository. "Dirty" because there are merge conflicts that need to be resolved, and structural sync process that need to be addressed.
The main issue is that the Copybara sync process does not recognize which edits are newer (internal vs external). For example it wants to overwrite the GitHub repo's build.yml file with old content from the internal repo, but that file has been updated more recently on the GitHub side.
Addressing the merge conflicts will take some work, and a plan. For files that are new, we should be able to merge them into the repo cleanly, but for files that have been updated on both sides, we will need to diligently resolve the conflicts.
We need to discuss a plan forward at the next working group meeting (code sync workstream).
This Pull Request contains changes from our internal repository.
Context Reference: HEAD
Copybara Current Rev: 752504293
Summary of Internal Changes: