Release Notes

macOS, Linux - Plastic: Update Workspace will now correctly update to latest when you have pending changes.

Previously it would not allow the update if you had the "Allow to merge with pending changes" setting disabled. This setting ought not to have applied in this scenario, where the new changesets are on the current branch.

All platforms - Plastic, Gluon, Command line client: now the before-clientcheckout and after-clientcheckout triggers won't run when undoing local changes. These triggers were being executed because of the way Plastic SCM undoes local changes - in order to do so, first local changes must be converted into controlled ones through the checkout operation (in order to apply not only modifications, but also to know which files were renamed, moved, or deleted). It really didn't make sense to get notified of checkouts that were going to be immediately undone, so we removed trigger execution in this scenario.

This change affects CLI commands such as "unco --all" and "undo", but also operations such as "undo" and "undo unchanged" operations through the GUIs.

All platforms - Command line client: Use the --automaticresolution option to choose whether the source or the destination contributor should be automatically selected to resolve the conflict.

For example, imagine that you have to merge branch /main/task257. And you want "eviltwin" and "movedelete" conflicts to resolve automatically, but following these rules: the merge operation must resolve the "eviltwin" conflicts by keeping the source contributor and the "movedelete" conflicts by keeping the destination contributor:

cm merge br:/main/task257 --merge --automaticresolution=eviltwin-src;movedelete-dst

Windows - Plastic: Incoming changes: As you may have already noticed, we are making a series of improvements in the single branch working workflow. One of these improvements is the "Incoming Changes" view.

The "Incoming Changes" view allows the developer to update your workspace to the latest changes in the working branch. You can launch the "Incoming Changes" view in two ways:

* When the GUI detects new changes in the working branch, a notification bar is displayed in the "Pending changes" view, next to the checkin comment. When you click the view new changes, the "Incoming Changes" view is displayed.

* When you try to checkin changes, but there are new changes in the working branch, the "Incoming Changes" view is displayed. In this case, we display a help tip to help to understand that you need to first resolve incoming changes, before checking in your changes.

This feature is experimental yet. You need to manually activate it, adding the following line in the client.conf configuration file, that is located at %LOCALAPPDATA%\plastic4 folder:

<EnableIncomingChanges>yes</EnableIncomingChanges>