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.13] Bugfix/fix vfs folder state when remote move is forbidden #7132

Merged
merged 2 commits into from
Sep 16, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Sep 16, 2024

Backport of #6717

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

when remote move is forbidden, desktop client will move back the folder
to its original name

in such cases, we were forgetting to set VFS metadata in their proper
state (i.e. placeholder in sync)

so ensure that when a remote move fails, we still touch VFS metadata
when appropriate and handle errors

Signed-off-by: Matthieu Gallien <[email protected]>
@backportbot backportbot bot added this to the 3.13.5 milestone Sep 16, 2024
@mgallien mgallien marked this pull request as ready for review September 16, 2024 15:40
when doing local discovery, it is possible that files or folders may be
discovered with VFS metadata not up to date (i.e. placeholder file not
set in sync)

in such case, generate a propagation instruction to set them in sync

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien merged commit 9559c83 into stable-3.13 Sep 16, 2024
8 of 12 checks passed
@mgallien mgallien deleted the backport/6717/stable-3.13 branch September 16, 2024 15:41
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7132-e20ef1c720751d4b470610e132f0f51d4f106b39-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.

Copy link

sonarcloud bot commented Sep 16, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants