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.12] when moving a file, checks that it exists at origin or destination #6509

Merged
merged 3 commits into from
Mar 5, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Mar 5, 2024

Backport of PR #6463

mgallien added 3 commits March 5, 2024 16:20
current automated tests are never breaking the rule that a file that
should be moved on client side (after a move was done server side)
exists either at teh original path or the destination path.

in practice it may happen (and I manually tested it) thet the sync
engine decides to move a single file in two distinct places

that decision will violate this rule and a debug build would then run
into the assert

Close #6462

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
this new test trigger the assert that a file is either in the old place
or the new place when we execute a MOVE instruction for a local file

in the test one file is discovered as in need of a local MOVE but will
be missing from the old and new places when running the propagation due
to a bug

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
will fix mishandling of rename of a single file to multiple places
during discovery

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@backportbot backportbot bot requested review from camilasan and mgallien March 5, 2024 16:20
@backportbot backportbot bot added this to the 3.12.1 milestone Mar 5, 2024
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6509-d1efc3383b8a2391692295ddc632b9570a4f324e-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

sonarqubecloud bot commented Mar 5, 2024

@mgallien mgallien merged commit a7b7b34 into stable-3.12 Mar 5, 2024
11 of 13 checks passed
@mgallien mgallien deleted the backport/6463/stable-3.12 branch March 5, 2024 20:15
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