Unity Version Control 11.0.16.7048

Windows - Plastic: Check out local changes is 300 times faster

• Windows

Windows - Plastic: Now, checking out local changes is much faster. For example, selecting 135 thousand private and checking them out now it takes less than 4s vs the almost 19 minutes that it took before.

• Windows

All clients: Fixed 'unable to sort' error working with local changes

All clients: You could get the error "Unable to sort because the `IComparer.Compare()` method returns inconsistent results" trying to check out, checkin, or undo the pending local changes. It happened due to complex dependencies among the local changes when there were locally moved involved. Now it's fixed.

All platforms - Command-line client: Paths described in trigger variables can now include whitespaces.

All platforms - Command-line client: Previously, plastic variables used in triggers such as `PLASTIC_BIN_PATH` , `WKSPACE_PATH` and `GLOBAL_CONFIG_PATH` were not resolving paths with white spaces. That led to wrong command formats when executing. Now, these paths are being wrapped inside double quotes when needed.

All platforms - Command-line client: You can have the following scenario:

All platforms - Command-line client: Have the directory where the Plastic SCM command line client is installed:

All platforms - Command-line client: And inside it, you are planning to store your triggers in a subfolder, something like:

All platforms - Command-line client: So, you could declare a trigger using the following scheme (in Windows cmd shell, for instance):

• Windows

All platforms - Command-line client: And it will solve the white space in `PLASTIC_BIN_PATH` to `C:\Program Files\PlasticSCM\client` when executing the trigger.

All platforms - Command-line client: Bear in mind that, as the path already has a whitespace ("after update" in the example above), you should add escaped quotes to it to specify the executable because we also support arguments. No extra quotes will be added in this case. Here we were considering cmd shell, so quotes are escaped with an extra double quote.

All platforms - Command-line client: You can also use commands with arguments and both command paths and arguments will properly resolve white spaces:

All platforms - Command-line client: In case you have a workspace such as `C:\my wkspace` you could create a trigger like the following:

All platforms - Command-line client: In this case, the whitespaces are going to be inserted in the plastic variable. This trigger will execute python, calling the file named `script.py` located in your workspace and passing to it an argument which is also resolved to the same path, something like executing:

All platforms - Command-line client: Find below examples of the same two commands to create triggers but in three different shells:

All platforms - Command-line client: 1- Windows CMD:

• Windows

All platforms - Command-line client: 2- Windows PowerShell

• Windows

All platforms - Command-line client: 3- Linux/MacOS bash:

• macOS
• Linux

All platforms - Server: Fixed slow connection issues

All platforms - Server: We fixed a bug that caused the server to close connections over SSL if the client did not start the second method call in under 10 seconds from the connection establishment.

All platforms - Server: This bug was because of a wrong tracking of the connection status from server side and could cause killing long-running operations (such as big check-ins) over slow networks with the error message "An existing connection was forcibly closed by the remote host".

Command-line client: Fixed null error undoing moved files

Command-line client: The "cm unco" could fail when there are pending moved files to undo. It could fail when the source and the destination directories are different directories, but both are under the same directory. Now it's fixed.

All platforms - PlasticX: New cross-platfrom mergetool

All platforms - PlasticX: Resolving conflicts in text files during merges will now launch a new cross-platform merge tool.

All platforms - PlasticX: When the merge tool window is opened, it tells you how many conflicts require user intervention. For each conflict, you can choose to take contribution from the remote version, your local version, or the base of the merge, by clicking the checkbox by each change.

All platforms - PlasticX: Step back and forth through the remaining unresolved conflicts using the arrows at the top of the screen. You can also step through all conflicts - unresolved, ones you've already resolved, and ones which were resolved automatically.

All platforms - PlasticX: The result of the merge is shown in the bottom panel. Once all conflicts are resolved, click Save and Exit to return to the merge.

All platforms - PlasticX: Here is an example conflict resolution.

All platforms - PlasticX: Before the resolution:

All platforms - PlasticX: And after the resolution. I chose to keep the local changes:

Windows - PlasticX: New Merge tool for binary files.

• Windows

Windows - PlasticX: We ported our legacy binary merge tool (only available in Windows GUI) to PlasticX.

• Windows

Windows - PlasticX: The binary merge tool allows the user to choose a version when all the versions in a merge, are changed. When resolving the merge, the chosen version will be the resulting file after the merge.

• Windows

Windows - PlasticX: When the content of the merged file can be previewed (any PlasticX supported image type), the preview is displayed. Otherwise, the OS file icon is displayed.

• Windows

Windows - PlasticX: The tool allows to "Open" or "Open with..." each version to allow the user to compare them. Also, some properties, such as file size or date modified, are displayed to help the user to choose a version.

• Windows

Windows - PlasticX: This is an example of merging a Word document:

• Windows

Windows - PlasticX: And this is an example of merging a png image:

• Windows

All platforms - PlasticX: Repository Empty State

All platforms - PlasticX: On home view, when a repository contains no files or directories, an "empty state" was added to what would otherwise be a blank panel.

All platforms - PlasticX, GluonX: Added undelete and undelete to the specified path

All platforms - PlasticX, GluonX: Added the 'Undelete revision' and 'Undelete revision to specified path...' options to the context menu for the diff window. It can be used to restore a single or multiple deleted items in PlasticX and GluonX.

All platforms - Plastic: Added explanatory text to the welcome window

All platforms - Plastic: When you open Plastic for the first time, you are asked to choose the GUI to work with. We added an explanatory text at the bottom of this window, which lets you know that you can change the GUI flavor at any time: