thomas.weltenbauer. Posted February 5, 2020 Report Share Posted February 5, 2020 Hello! I was used to switch between changesets and branches with pending changes in Plastic. But this is no longer possible, no matter what I do. Basic infos: Plastic Client Version: 8.0.16.3899 "Allow when trying to switch / update workspace with changed items" is set to "Allow" in the settings Pending changes are checked-out My workspace is set to a branch and I'm trying to switch to another branch (not changeset as described in the thread Update workspace with pending changes) But I'm pretty sure I switch between changesets as well some time ago. The message is the same (no matter if I switch from branch to branch, from branch to changeset or from changeset to changeset): "Cannot perform the switch to branch/label/changeset/shelve since there are pending changes. Please review the pending changes and retry the operation again." Update of the workspace works (if there is a newer changeset on the branch) I also double checked that "PendingChangesOnSwitchAction" is set to "None" in my client.conf. I also made a short test in a small project with the same result. This is where I made this screenshots: Pending Changes View in Branch Explorer (tried to switch from main branch to /main/TestBranch) Workspace Settings And the message I can't say since which version of the client this isn't working but I didn't changed my behaviour and wondered, why this isn't working. Do you have a idea what could be the problem ore any recommendation what I could test? Thanks in advance! Thomas Link to comment Share on other sites More sharing options...
Héber Posted February 5, 2020 Report Share Posted February 5, 2020 Hi Thomas, Did you recently add a some items to a cloaked list? I'm afraid they are not compatible with the update-merge workflow. Did you have enabled the "Run fast update" option? Best, Héber. Link to comment Share on other sites More sharing options...
thomas.weltenbauer. Posted February 5, 2020 Author Report Share Posted February 5, 2020 The ignore.conf file was just an example. This was the first file I could find and I simply only checked it out in Plastic without any changes. This is the same for every other file. The behaviour changed in a long running project where this worked all the time, so the cloaked items can't be the problem. (Additional information: We don't use a cloaked.conf file in any project so there are no cloaked files) The "Run fast update" is not available in my plastic client. Looks like you removed it (see https://www.plasticscm.com/download/releasenotes/8.0.16.3651#8.0.16.3651-new-7). It's possible this setting is activated but since it is hidden, can't be changed. I could test it if you can tell me which entry I have to change in the config file. Link to comment Share on other sites More sharing options...
mig Posted February 5, 2020 Report Share Posted February 5, 2020 Hi @thomas.weltenbauer., Unfortunately, I'm afraid you can't switch your workspace to another branch, changeset or label if you have checked-out items. Generally speaking, any controlled change prevents you from changing the workspace location. The setting you pointed out only applies to items that are locally changed in the workspace. In this scenario, first you need to either check your changes in or undo them, optionally shelving them or backing them up elsewhere. Then you'll be able to switch your workspace as you wish. From then on, you'll be able to perform those switches as long as you have local changes only. Could you please verify that this is what's actually going on in your scenario? Thanks! Link to comment Share on other sites More sharing options...
thomas.weltenbauer. Posted February 11, 2020 Author Report Share Posted February 11, 2020 Ok maybe this is the problem. I was confused because psantosl talked about "marked as checkout" in this thread: https://forum.plasticscm.com/topic/20437-update-workspace-with-pending-changes/ With changed items it is possible to switch branches/changeset, but checkout files are not. Thank you for your help! Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now