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

Allow deleting remotely deleted files locally in case of upload errors #6014

Merged
merged 1 commit into from
Sep 4, 2023

Conversation

allexzander
Copy link
Contributor

No description provided.

@allexzander allexzander force-pushed the bugfix/do-not-abort-sync-on-normalerror branch from 23d3761 to f0ab1d3 Compare August 31, 2023 17:09
@allexzander allexzander force-pushed the bugfix/do-not-abort-sync-on-normalerror branch from f0ab1d3 to 29c903e Compare September 1, 2023 14:56
@allexzander allexzander changed the title Do not abort sync on normal error. [DO NOT MERGE] Do not abort sync on normal error. Sep 1, 2023
@codecov
Copy link

codecov bot commented Sep 1, 2023

Codecov Report

Merging #6014 (5470aa9) into master (54d9905) will increase coverage by 0.00%.
The diff coverage is 50.00%.

❗ Current head 5470aa9 differs from pull request most recent head 0f7d29b. Consider uploading reports for the commit 0f7d29b to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #6014   +/-   ##
=======================================
  Coverage   60.10%   60.10%           
=======================================
  Files         145      145           
  Lines       18838    18851   +13     
=======================================
+ Hits        11322    11330    +8     
- Misses       7516     7521    +5     
Files Changed Coverage Δ
src/libsync/discoveryphase.h 20.00% <ø> (ø)
src/libsync/owncloudpropagator.cpp 84.52% <0.00%> (-0.11%) ⬇️
src/libsync/syncengine.cpp 80.72% <20.00%> (-0.42%) ⬇️
src/libsync/discoveryphase.cpp 79.05% <100.00%> (+0.39%) ⬆️

@allexzander allexzander changed the title [DO NOT MERGE] Do not abort sync on normal error. Allow deleting remotely deleted files locally in case of upload errors Sep 1, 2023
@allexzander allexzander force-pushed the bugfix/do-not-abort-sync-on-normalerror branch 2 times, most recently from 2c9d328 to 5470aa9 Compare September 4, 2023 08:01
…emoved items that need to be downsynced.

Signed-off-by: alex-z <blackslayer4@gmail.com>
@allexzander allexzander force-pushed the bugfix/do-not-abort-sync-on-normalerror branch from 5470aa9 to 0f7d29b Compare September 4, 2023 08:02
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6014-2c9d32809cebcc92f570cdcafb89be3f136143a2-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.

@sonarcloud
Copy link

sonarcloud bot commented Sep 4, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

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

53.8% 53.8% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@allexzander allexzander merged commit 270f6bf into master Sep 4, 2023
10 of 12 checks passed
@allexzander allexzander deleted the bugfix/do-not-abort-sync-on-normalerror branch September 4, 2023 11:51
@allexzander
Copy link
Contributor Author

/backport to stable-3.10

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.

4 participants