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.14] Bugfix/use file id to track renamed items #7343

Merged
merged 3 commits into from
Oct 17, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Oct 17, 2024

Backport of PR #7334

@backportbot backportbot bot requested review from claucambra and mgallien October 17, 2024 07:46
@backportbot backportbot bot added this to the 3.14.2 milestone Oct 17, 2024
why one would not update the modification time when modifying a remote
file during automated tests

there is no reason to not update the modification time as this is what
is done by the server

Signed-off-by: Matthieu Gallien <[email protected]>
NEW/NEW conflicts could sometime be ignored and replaced by update
metadata instructions

we stop doing this and handle them like any other conflicts

that would cause more download from the server

those conflicts would be solved automatically in case this is not a real
conflict but the client was missing the server reply with the updated
metadata

will enable more changes to improve MOVE detection from server side

Signed-off-by: Matthieu Gallien <[email protected]>
orignally added by owncloud/client#6632

most probably a too strong assumption on the behavior of the Nextcloud
server

better check real item metadata like fileid, size or modification time

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the backport/7334/stable-3.14 branch from 5751042 to a758ab3 Compare October 17, 2024 09:22
@mgallien mgallien merged commit 5bdc2b9 into stable-3.14 Oct 17, 2024
9 of 14 checks passed
@mgallien mgallien deleted the backport/7334/stable-3.14 branch October 17, 2024 09:23
Copy link

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7343-a758ab3957e69489777241de9c26bc295f12eee1-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.

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