fall back to filename for restore if original location can't be determined#4604
Merged
provokateurin merged 3 commits intomasterfrom May 4, 2026
Merged
fall back to filename for restore if original location can't be determined#4604provokateurin merged 3 commits intomasterfrom
provokateurin merged 3 commits intomasterfrom
Conversation
Signed-off-by: Robin Appelman <robin@icewind.nl>
…determined Signed-off-by: Robin Appelman <robin@icewind.nl>
Member
Author
|
/backport to stable33 |
Member
Author
|
/backport to stable32 |
Member
Author
|
/backport to stable31 |
Member
Author
|
/backport to stable30 |
Signed-off-by: Robin Appelman <robin@icewind.nl>
artonge
approved these changes
Apr 30, 2026
CarlSchwan
approved these changes
May 4, 2026
provokateurin
approved these changes
May 4, 2026
This was referenced May 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If the original location of a trash item can't be determined, base the restore target on the path instead.
This usually ends up with it placing the restored item in the root of the groupfolder.
The current broken behavior ends up trying to use
''as the target, which ends up conflict resolving into something like' (2)'.