Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-3.9] Create placeholder while dehydrating if needed #5906

Merged
merged 1 commit into from Jul 20, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #5890

When replacing an OnlineOnly file by another one, the file maintains it
OnlineOnly pin state, but it is converted to a regular file. So, the
dehydration should convert the regular file to a (dehydrated)
placeholder instead of trying to update the (non-existing) placeholder.

Closes #4274

Signed-off-by: Dries Mys <dries.mys@my-dreams.be>
@backportbot-nextcloud backportbot-nextcloud bot added this to the 3.9.1 milestone Jul 20, 2023
@mgallien mgallien self-requested a review July 20, 2023 15:08
@mgallien mgallien enabled auto-merge July 20, 2023 15:09
@sonarcloud
Copy link

sonarcloud bot commented Jul 20, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@codecov
Copy link

codecov bot commented Jul 20, 2023

Codecov Report

Merging #5906 (241101b) into stable-3.9 (470a983) will increase coverage by 0.00%.
The diff coverage is 66.66%.

Additional details and impacted files
@@             Coverage Diff             @@
##           stable-3.9    #5906   +/-   ##
===========================================
  Coverage       60.45%   60.45%           
===========================================
  Files             145      145           
  Lines           18650    18653    +3     
===========================================
+ Hits            11274    11276    +2     
- Misses           7376     7377    +1     
Impacted Files Coverage Δ
src/libsync/vfs/cfapi/cfapiwrapper.cpp 72.80% <66.66%> (-0.05%) ⬇️

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5906-241101b9136391abdfde6ef35feac5790d71d9d0-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit ecb5b5c into stable-3.9 Jul 20, 2023
13 checks passed
@mgallien mgallien deleted the backport/5890/stable-3.9 branch July 20, 2023 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants