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

if a virtual file change but nothing changed: set it as in sync #6621

Merged
merged 1 commit into from
Apr 23, 2024

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented Apr 11, 2024

some software (at least outlook native software) may fiddle with CfApi placeholder metadata and set a .msg file to be out of sync state when opening it

in that case, we will let the sync engine go over it and decide what to do

it is then possible in that case that we would just put it back in "in sync" state

@mgallien mgallien force-pushed the bugfix/fixMsgVfsState branch 5 times, most recently from d023c0b to 2bae949 Compare April 14, 2024 15:07
@mgallien mgallien changed the title if a virtual file change but bothing changed: set it as in sync if a virtual file change but nothing changed: set it as in sync Apr 23, 2024
@mgallien mgallien force-pushed the bugfix/fixMsgVfsState branch 3 times, most recently from 617e1ac to d89dab5 Compare April 23, 2024 14:20
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Clang-Tidy found issue(s) with the introduced code (1/1)

src/libsync/vfs/suffix/vfs_suffix.h Outdated Show resolved Hide resolved
src/common/vfs.h Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/vfs_cfapi.h Outdated Show resolved Hide resolved
src/libsync/vfs/xattr/vfs_xattr.h Outdated Show resolved Hide resolved
@camilasan
Copy link
Member

@mgallien maybe you could add to the commit message why the virtual file would change, like in this case Outlook was changing the file.

@mgallien
Copy link
Collaborator Author

@mgallien maybe you could add to the commit message why the virtual file would change, like in this case Outlook was changing the file.

done
hope the new one is better

@mgallien
Copy link
Collaborator Author

some software (at least outlook native software) may fiddle with CfApi
placeholder metadta and set a .msg file to be out of sync state when
opening it

in that case, we will let the sync engine go over it and decide what to
do

it is then possible in that case that we would just put it back in "in
sync" state

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien merged commit 5450552 into master Apr 23, 2024
9 of 12 checks passed
@mgallien mgallien deleted the bugfix/fixMsgVfsState branch April 23, 2024 16:04
@mgallien
Copy link
Collaborator Author

/backport to stable-3.12

@mgallien
Copy link
Collaborator Author

/backport to stable-3.13

Copy link

backportbot bot commented Apr 23, 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/6621/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 1522d01d

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6621/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.

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6621-1522d01d5b21a808e190c0b6d8c895b1a075ca3a-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 Apr 23, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

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.

3 participants