David Cañadas Posted July 27, 2021 Report Share Posted July 27, 2021 I am writing a server utility that needs to apply a shelve without checking it in. The shelve is applied using: cm shelveset apply SOURCESPEC with the current working directory pointing to a valid workspace directory. When there is a conflict between the current workspace state and the shelve and the file type is recognized as a $text type, the Plastic SCM GUI merge tool is launched. I know I can deactivate it manually but I would like to know whether I can skip the tool and just make the command fail without changing the merge tool assigned to my Plastic SCM install (like in cm merge where you can say --nointeractiveresolution). Link to comment Share on other sites More sharing options...
calbzam Posted July 28, 2021 Report Share Posted July 28, 2021 Hi, I think you should be able to us the "cm merge sh:123 --nointeractiveresolution --merge" even if you are merging a shelve instead of a regular changeset. Regards, Carlos. Link to comment Share on other sites More sharing options...
David Cañadas Posted July 29, 2021 Author Report Share Posted July 29, 2021 Hi Carlos, Sure I can, but my utility needs to apply the shelve without checking it in, like you do in the Plastic SCM GUI. Link to comment Share on other sites More sharing options...
calbzam Posted July 29, 2021 Report Share Posted July 29, 2021 Hi David, This above command should perform the merge in your workspace but it shouldn't perform the checkin. Regards, Carlos. 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