Retry failed accept moves and keep them pending instead of dropping#719
Merged
Conversation
Accepting a move races the diff tool teardown: a killed tool releases its file handles asynchronously (and job objects reap children a beat after the direct kill), and a tool killed mid-startup can leave an orphan that only takes its locks after the kill. InnerMove did a single move attempt and a single lock query, and treated "no locker found" as success - silently dropping the move while the target was never updated. - Retry the move and lock query for a few seconds; lockers found on any attempt go through the existing prompt/kill flow - Never treat an unexplained failure as success: keep the move pending and show a balloon notification - Skip the scan round instead of surfacing an error dialog when a tracked file is exclusively locked (FileComparer opens with FileShare.Read and HandleScanMove only tolerated FileNotFoundException) - Move the ContainsFiles check inside the try in SafeDeleteDirectory
This was referenced Jul 20, 2026
Closed
This was referenced Jul 20, 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
1 participant
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.
Accepting a move races the diff tool teardown: a killed tool releases its file handles asynchronously (and job objects reap children a beat after the direct kill), and a tool killed mid-startup can leave an orphan that only takes its locks after the kill. InnerMove did a single move attempt and a single lock query, and treated "no locker found" as success - silently dropping the move while the target was never updated.