core/merge: Update remote metadata of trashed docs #2260
Merged
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.
Since trashing a document on the remote Cozy changes its CouchDB
revision, we need to store this updated metadata in our local PouchDB.
This makes future changes on the remote doc and detecting that the
trashed remote document is up-to-date possible.
We were updating the remote revision only when the doc had previously
been moved and that move wasn't synchronized yet.
We're now saving the complete updated remote metadata whenever merging
a document trashing (this includes the
trashed
attribute).Please make sure the following boxes are checked: