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

only use VFS update instruction when sync engine would do nothing #6827

Merged

Conversation

mgallien
Copy link
Collaborator

will ensure we do not erroneously use this instruction when we should not

@mgallien mgallien requested review from camilasan and claucambra June 19, 2024 17:06
will ensure we do not erroneously use this instruction when we should
not

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the bugfix/doNotUpdateVfsMetadataWhenSomethingElseIsNeeded branch from cc6fc8f to 03c4864 Compare June 20, 2024 06:44
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6827-03c48643a2450c462acab245a8aa9d5ca0dc44c8-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 Jun 20, 2024

@mgallien mgallien merged commit 07b182d into stable-3.13 Jun 20, 2024
11 of 13 checks passed
@mgallien mgallien deleted the bugfix/doNotUpdateVfsMetadataWhenSomethingElseIsNeeded branch June 20, 2024 07:25
@mgallien
Copy link
Collaborator Author

/backport to stable-3.12

Copy link

backportbot bot commented Jun 20, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/6827/stable-3.12

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 03c48643

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6827/stable-3.12

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
src/gui/macOS/ClientCommunicationProtocol.h
Please commit your changes or stash them before you switch branches.
Aborting


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

@mgallien mgallien restored the bugfix/doNotUpdateVfsMetadataWhenSomethingElseIsNeeded branch June 20, 2024 07:35
@PhilippSchlesinger
Copy link

@mgallien thx for that fix, it seems to work well with 3.12.6.
Did it get merged into master as well? I can only find PRs for 3.13 (#6827) and 3.12 (#6828).

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.

4 participants