Skip to content

Commit

Permalink
FPlasticSourceControlState::CanCheckout() now let the user try to che…
Browse files Browse the repository at this point in the history
…ckout even if an asset is already checked-out elsewhere

As with multiple destination branches it is possible to have as many locks on the same asset as destination branches.

Note: Ideally we would want to check explicitly if the other lock is "on the same destination branch" as the current branch,
but that's overly complex and not possible currently with cm.
  • Loading branch information
SRombautsU committed Jan 29, 2024
1 parent d5d7d71 commit 40cd6db
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ bool FPlasticSourceControlState::CanCheckout() const

const bool bCanCheckout = (WorkspaceState == EWorkspaceState::Controlled // In source control, Unmodified
|| WorkspaceState == EWorkspaceState::Changed) // In source control, but not checked-out
&& !IsCheckedOutOther() // Is not already checked-out elsewhere
// && !IsCheckedOutOther() // Note: with multi-destination branches it is sometimes possible to checkout an asset already checked-out elsewhere. Let the user try.
&& IsCurrent(); // Is up to date (at the revision of the repo)

if (!IsUnknown())
Expand Down

0 comments on commit 40cd6db

Please sign in to comment.