Jump to content

Apply shelve with conflicts from command line opens a GUI merge tool


David Cañadas

Recommended Posts

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

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 account

Sign in

Already have an account? Sign in here.

Sign In Now
×
×
  • Create New...