Release Notes

All platforms - Command-line client, Desktop GUI: Improved Switch Experience with Pending Changes

Now you can seamlessly bring your pending changes with you when switching workspace configurations, both in the command line and in the Desktop GUI.

When using the Desktop GUI, a prompt will help you to enable this feature. You can also enable it within the Desktop GUI preferences dialog:

Screenshot

And also, by setting the following key and value in your client.conf configuration file:

<PendingChangesOnSwitchAction>Shelve</PendingChangesOnSwitchAction>

Bringing your changes works as follows: when switching your workspace configuration by either using the Desktop GUI or the cm switch and cm partial switch commands, your client will look for pending changes in your workspace. If it finds any, it will ask you what you want to do, and it will present you three options:

* To shelve your pending changes and leave them on the source for future use.

* To bring the changes with you, moving them seamlessly to the destination branch.

* To cancel the operation.

If you choose to shelve your pending changes and leave them on the source, the client will create a shelveset with the changes, then switch your workspace configuration. You can apply the shelveset later on, whenever you want to. If you are using the Desktop GUI, the notifications it provides will indicate you that there are shelved changes and guide you through each step to apply them back, making the process smoother and more intuitive.

If you choose to bring your pending changes, the client will create a shelveset with the changes, then switch your workspace configuration, and finally will try to automatically apply the shelveset, effectively bringing your pending changes with you. If merge conflicts arise, you can choose whether to resolve them or to cancel the operation. Don't worry! If you cannot apply the shelveset, it won't be deleted either, so you can still apply it later on.

Screenshot

Because of output compatibility, this new behavior gets disabled in the command line when using flags such as --machinereadable and --xml. If any of those flags are present, and PendingChangesOnSwitchAction is set to Shelve, the client will temporarily change the configuration value from Shelve to Fail, and you won't be able to change your workspace configuration with pending changes on your workspace. Bear in mind this if you have automated anything on top of the cm command-line client!

All Platforms - Desktop GUI: Rename sync view's 'delete src/dst repo' buttons

Some users reported that the 'delete src/dst repo' buttons in the Sync Repositories view were confusing, as they thought it would delete the entire repository instead of just removing it from the sync view. To address this, the button was renamed to 'remove src/dst repo', and additional tooltips were added to clarify the action performed by the buttons.