Fix renaming process in folder compare window. #1246
Merged
Conversation
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
… when renaming a file (directory) that exists on only one side to a name where the directory (file) with the same name exists. - Change to judge that a directory or file exists only if the type (directory or file) of renamed item matches the original diffItem type in the diffItem update process.
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The comparison result is not displayed correctly when renaming a file (directory) that exists on only one side to a name where the directory (file) with the same name exists.
Example 1. Rename file AAA to BBB when file AAA (left only) and directory BBB (right only) exist.
Example 2. Rename directory BBB to AAA when file AAA (left only) and directory BBB (right only) exist.
This PR fixes this issue by changing to judge that a directory or file exists only if the type (directory or file) of renamed item matches the original diffItem type in the diffItem update process.