Support syncing arbitrary names in full sync mode#1
Open
agawande wants to merge 19 commits intonamed-data:masterfrom
Open
Support syncing arbitrary names in full sync mode#1agawande wants to merge 19 commits intonamed-data:masterfrom
agawande wants to merge 19 commits intonamed-data:masterfrom
Conversation
Contributor
Author
|
Need to write some unit tests (or generalize existing unit tests) for checking the syncing of arbitrary names. |
|
This pull request was opened on March 12 to merge the Hackathon code. Since then, some commits in the master branch have major changes. How to resolve? |
Member
|
Rebase on top of current master branch, solving the merge conflicts, and then push again. But why was this submitted as a PR in the first place? We use gerrit for PSync... |
Contributor
Author
|
Submitted as a PR to preserve commit history from the Hackathon. |
Member
|
You can do the exact same thing on gerrit |
Contributor
Author
|
Okay, won't each commit be a separate change? |
Member
|
Yes of course, one commit == one change. Isn't that what you want? To preserve the commit history? |
…Nack to PartialProducer Change-Id: Ia3c56b732c1e774570abba20f834089e2774e9e0
…new function insertToIBF called by updateSeqNo Change-Id: I9c85017f6497bb1cf36f72ba2fa2d9f1ec3d188b
Change-Id: I29e3b3fba8e6eaee67a324bb66467d4d3bab5ecf
Change-Id: Ie9b9470cf3608ad1b207ed438cb20d78f2b3863f
refs: #4844 Change-Id: I4c74c97ef7d14ea67c4430563340aafd43e00c3c
Change-Id: I72aaf3119dc697509388c12224ad4d7902a71c2e
Change-Id: If9d06c73f9d6e01f140295fc482a82af1e416c08
Fix sync Change-Id: I672ddcba40a589b69168d7b6f1acf6a60e27bb6a
…sed local variable.
Fix some code style issues Change-Id: I718241514bc05516ba18910e57fa6f49e0ad6602
Change-Id: Ibde090c3fc7cbc72b536cfe08660cd667f600309
examples: fix compilation Change-Id: I0293d3a661353b49d8f006b1d48259dbf923c785
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
3 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.
8th hackathon work.