-
Notifications
You must be signed in to change notification settings - Fork 16
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
feat: handle file move then edit scenario #601
Merged
Merged
Conversation
This file contains 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
mshanemc
changed the title
Sm/file-moves-again
feat: handle file move then delete scenario
Jun 4, 2024
mshanemc
commented
Jun 4, 2024
@@ -73,7 +81,14 @@ export const getMatches = (status: StatusRow[]): AddedAndDeletedFilenames => { | |||
return { added: addedFilenamesWithMatches, deleted: deletedFilenamesWithMatches }; | |||
}; | |||
|
|||
/** build maps of the add/deletes with filenames, returning the matches Logs if non-matches */ | |||
export const getLogMessage = (matches: StringMapsForMatches): string => |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
with the more complex result object, this made more sense to handle outside the ShadowRepo class
mshanemc
changed the title
feat: handle file move then delete scenario
feat: handle file move then edit scenario
Jun 4, 2024
QA NOTES
|
iowillhoit
approved these changes
Jun 7, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Will fix conflicts
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.
What does this PR do?
when a file is moved, but then also modified before doing
preview|deploy|retrieve
before:
the hashes didn't match, so both the "add" and the "delete" were shown/used
after
the "add" is kept (ex: it would show up a something to deploy) but the "delete" is committed/cleared (it would not show up as something that needs deleting)
other
What issues does this PR fix or reference?
@W-15840593@
forcedotcom/cli#2880