Implement the "Unshelve" operation for Unreal Engine 5 #61
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
… to only unshelved the desired changes from a shelve
SRombautsU
force-pushed
the
1002200-unshelve-files
branch
from
898c9dd to
66075a6
Compare
…elist, and refresh the cache TODOs are in comments with all the steps
SRombautsU
force-pushed
the
1002200-unshelve-files
branch
from
66075a6 to
a3326a9
Compare
Detect if any file to unshelve has some local modification, which would fail the "unshelve" operation with a merge conflict
SRombautsU
force-pushed
the
1002200-unshelve-files
branch
2 times, most recently
from
132db2c to
0a9d701
Compare
from the Menu to a dedicated PackageUtils namespace and files
SRombautsU
force-pushed
the
1002200-unshelve-files
branch
from
0a9d701 to
a520dd3
Compare
…em and the current map
SRombautsU
force-pushed
the
1002200-unshelve-files
branch
from
a520dd3 to
f131400
Compare
…or "Copied", "Replaced", "Conflicted" This is a function to update the cache, used in a few places but not everywhere so apparently it didn't hit us before
juliomaqueda
requested changes
Jan 23, 2023
There was a problem hiding this comment.
Great work @SRombautsU! Please, take a look at the comments.
Source/PlasticSourceControl/Private/PlasticSourceControlOperations.cpp
Outdated
Show resolved
Hide resolved
Source/PlasticSourceControl/Private/PlasticSourceControlOperations.cpp
Outdated
Show resolved
Hide resolved
Source/PlasticSourceControl/Private/PlasticSourceControlOperations.cpp
Outdated
Show resolved
Hide resolved
as well as a couple of other minor improvements suggested during code review
juliomaqueda
approved these changes
Jan 23, 2023
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.
Using 'cm shelveset apply sh:ShelveId paths'