Skip to content

Commit

Permalink
Fix #32 the new checkin --update option does not work (assets are loc…
Browse files Browse the repository at this point in the history
…ked)

(reverted from commit 1a68d79 for #23)
  • Loading branch information
SRombauts committed Jul 9, 2017
1 parent 1ac8904 commit dc0f10e
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,9 @@ bool FPlasticCheckInWorker::Execute(FPlasticSourceControlCommand& InCommand)
// Detect special case for a partial checkout (CS:-1 in Gluon mode)!
if (-1 != InCommand.ChangesetNumber)
{
Parameters.Add(TEXT("--all")); // Also files Changed (not CheckedOut) and Moved/Deleted Locally
Parameters.Add(TEXT("--update")); // Processes the update-merge automatically if it eventually happens.
Parameters.Add(TEXT("--all")); // Also files Changed (not CheckedOut) and Moved/Deleted Locally
// NOTE: --update added as #23 but removed as #32 because most assets are locked by the Unreal Editor
// Parameters.Add(TEXT("--update")); // Processes the update-merge automatically if it eventually happens.
InCommand.bCommandSuccessful = PlasticSourceControlUtils::RunCommand(TEXT("checkin"), Parameters, InCommand.Files, InCommand.Concurrency, InCommand.InfoMessages, InCommand.ErrorMessages);
}
else
Expand Down

0 comments on commit dc0f10e

Please sign in to comment.