This repository has been archived by the owner on Jul 31, 2020. It is now read-only.
Merge by id action (staging) #313
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
AlexeyBarabash
changed the title
|
If you want to merge this into staging, you should remove brave-syncer specific commit "Add MetaInfo to Bookmark", otherwise you can merge into brave-syncer branch |
|
@darkdh yes, reopened PR for brave-syncer-staging branch |
darkdh
suggested changes
May 13, 2019
AlexeyBarabash
force-pushed
the
brave-syncer-staging
branch
from
a72d29c
to
3c72f2b
Compare
AlexeyBarabash
force-pushed
the
merge_by_id_action_staging
branch
from
88f85d3
to
e07de75
Compare
AlexeyBarabash
force-pushed
the
merge_by_id_action_staging
branch
from
39dad93
to
23bec26
Compare
…d missing 'parentFolderObjectId':[]
Create + Update + Update of an existing object should resolve to a separate Update
AlexeyBarabash
force-pushed
the
merge_by_id_action_staging
branch
from
23bec26
to
4af5ad4
Compare
|
CI failed because |
|
reopened PR to trigger new CI run |
darkdh
reviewed
May 16, 2019
There was a problem hiding this comment.
Why don't we have to update these two test cases?
4af5ad4#diff-dbbb41acf4ed22ffd4a6afc45647bb64R408
4af5ad4#diff-dbbb41acf4ed22ffd4a6afc45647bb64R429
…st to 'sequential Updates should become no op if the merged result equals to existingObject'
darkdh
approved these changes
May 16, 2019
This was referenced Oct 15, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
We met the situation when [CREATE, UPDATE] were merged to [CREATE], which was then ignored because local object had been existed.
This PR makes CREATE and DELETE records stays alone to prevent such ignoring. So only UPDATE records of the same object id are merged.
STR for brave-core brave-syncer branch:
Bookmarks BarfolderExpected on DeviceA: bookmarks should be moved.