Skip to content

Commit

Permalink
And include all the dependent items automatically to the checkin.
Browse files Browse the repository at this point in the history
  • Loading branch information
SRombautsU committed Mar 25, 2024
1 parent 9f134cb commit 91ac16c
Showing 1 changed file with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -466,18 +466,17 @@ bool FPlasticCheckInWorker::Execute(FPlasticSourceControlCommand& InCommand)
{
TArray<FString> Parameters;
Parameters.Add(FString::Printf(TEXT("--commentsfile=\"%s\""), *CommitMsgFile.GetFilename()));
Parameters.Add(TEXT("--all")); // Also files Changed (not CheckedOut) and Moved/Deleted Locally
Parameters.Add(TEXT("--private")); // Also Private files (not in source control)
Parameters.Add(TEXT("--dependencies")); // Include all the dependent items automatically.
if (!GetProvider().IsPartialWorkspace())
{
Parameters.Add(TEXT("--all")); // Also files Changed (not CheckedOut) and Moved/Deleted Locally
Parameters.Add(TEXT("--private")); // Also Private files (not in source control)
// NOTE: --update added as #23 but removed as #32 because most assets are locked by the Unreal Editor
// 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, Files, InCommand.InfoMessages, InCommand.ErrorMessages);
}
else
{
Parameters.Add(TEXT("--applychanged")); // Also files Changed (not CheckedOut) and Moved/Deleted Locally
Parameters.Add(TEXT("--private")); // Also Private files (not in source control)
InCommand.bCommandSuccessful = PlasticSourceControlUtils::RunCommand(TEXT("partial checkin"), Parameters, Files, InCommand.InfoMessages, InCommand.ErrorMessages);
}
if (InCommand.bCommandSuccessful)
Expand Down

0 comments on commit 91ac16c

Please sign in to comment.