Update file's metadata in the local database when the etag changes while file remains unchanged. Fix subsequent conflict when locking and unlocking.#5293
Merged
allexzander merged 1 commit intoDec 30, 2022
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #5293 +/- ##
==========================================
- Coverage 57.69% 57.58% -0.12%
==========================================
Files 139 139
Lines 17614 17631 +17
==========================================
- Hits 10163 10153 -10
- Misses 7451 7478 +27
|
claucambra
approved these changes
Dec 21, 2022
allexzander
force-pushed
the
bugfix/do-not-generate-conflict-when-locking-and-unlocking
branch
2 times, most recently
from
ed42534 to
dc3e6d9
Compare
mgallien
approved these changes
Dec 30, 2022
mgallien
force-pushed
the
bugfix/do-not-generate-conflict-when-locking-and-unlocking
branch
from
dc3e6d9 to
9cf7728
Compare
…ile file remains unchanged. Fix subsequent conflict when locking and unlocking. Signed-off-by: alex-z <blackslayer4@gmail.com>
allexzander
force-pushed
the
bugfix/do-not-generate-conflict-when-locking-and-unlocking
branch
from
9cf7728 to
50ffc73
Compare
|
AppImage file: nextcloud-PR-5293-50ffc7373fd4f0cd645343622754ff55f4350a49-x86_64.AppImage |
|
SonarCloud Quality Gate failed. |
allexzander
deleted the
bugfix/do-not-generate-conflict-when-locking-and-unlocking
branch
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
4 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.
Signed-off-by: alex-z blackslayer4@gmail.com