Skip to content
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

Prevent shelving a file that is checked-out but without any change #74

Merged
merged 4 commits into from
Apr 3, 2023

Conversation

SRombautsU
Copy link

  1. In case multiple checked-out files in a changelist are shelved at once, only try to put in the shelves the files that contain actual changes, since Unity Version Control (formerly Plastic SCM) won't let them in (before the fix it was silently succeeding but the file was in fact not in the shelve and a refresh of the UI would see it disappear)
  2. In case all files are unchanged, don't even create the shelve if no files are left to shelve, in order to avoid dangling shelve/leaking them since they are not visible in the UI of Unreal

Don't create the shelve if no files are left to shelve, in order to avoid dangling shelve/leaking them since they are not visible in the UI of Unreal
@SRombautsU SRombautsU added the bug label Mar 31, 2023
@SRombautsU SRombautsU self-assigned this Mar 31, 2023
Revert back the changelist if one was created, moving back files to the Default changelist as expected by the Unreal Editor
…modifies

With multiple files, removing an unchanged file meant skipping/not testing the next one!
@juliomaqueda juliomaqueda merged commit 64df305 into master Apr 3, 2023
@juliomaqueda juliomaqueda deleted the 1002915-fix-shelving-checkedout-unchanchanged branch April 3, 2023 08:25
SRombautsU pushed a commit that referenced this pull request Aug 1, 2023
…cSCM/1002915-fix-shelving-checkedout-unchanchanged
SRombautsU pushed a commit that referenced this pull request Aug 1, 2023
…15-fix-shelving-checkedout-unchanchanged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants