Unity Version Control 11.0.16.7726

All platforms - Command-line client: Flag to print just the root spec

All platforms - Command-line client: Now the shelve creation is able to print just the shelveset spec of the root repository, skipping other "xlinked" shelvesets created this way. This is useful for automation purposes.

All platforms - Command-line client: Example:

All platforms - DevOps: Trunkbot now also sends trunk branch in a property

All platforms - DevOps: The trunkbot now also sends the configured trunk branch (usually the /main branch) to the underlying Continuous Integration system in a property named `PLASTICSCM_MERGEBOT_TRUNK_NAME` .

Windows - Gluon: Removed "Switch to Legacy GUI" menu option

• Windows

Windows - Gluon: This release marks the end of support for the legacy Gluon GUI for Windows.

• Windows

Windows - Gluon: We removed the "Switch to Legacy GUI" menu option in Gluon, and soon the executable won't be included in the install package.

• Windows

All platforms - Plastic: Unified the style of the color pickers

All platforms - Plastic: We unified the style of all color pickers that are shown in the application. This is how they look now:

Linux - Plastic: Allow changing the editor font.

• Linux

Linux - Plastic: For Windows and macOS you could change the font of the diff/merge:

• Windows
• macOS
• Linux

Linux - Plastic: Now you can also do it on Linux

• Linux

All platforms - Plastic: Unified the look of the overlapped views

All platforms - Plastic: Sometimes when opening a view that requires all the space in the window, we open it on top of the current view. Overlapped views show a header at the top, that you can also use to close the view go back to the previous one.

All platforms - Plastic: We unified the style of these headers, and now all overlapped views in the application have the same look.

MacOS - Plastic: Update default merge tool

• macOS

MacOS - Plastic: We updated the merge tool that is used by default to solve file merge conflicts. Now, unless you change it manually, the name of the new cross-platform merge tool will be used, instead of the legacy platform-specific one

• macOS

Command-line client: Merge command improved for automation

Command-line client: Several options have been added, mirroring the update command: --xml and --encoding:

Command-line client: See --usage for details:

All Platforms - Plastic: Merge files from command line with Binary Merge

All Platforms - Plastic: A quick way to get started is to run Plastic with a single argument:

All Platforms - Plastic: plastic binmerge

All Platforms - Plastic: plasticgui binmerge

All Platforms - Plastic: plasticgui binmerge

All Platforms - Plastic: For example, To merge two files with a common base file:

All Platforms - Plastic: In order to determine if a merge was successful, Plastic will return 0 or 1 as the application exit code. 0 means a merge was successfully performed and the result file has been save, 1 means that a merge has been aborted or not saved.

For Windows:

• Windows

For MacOS:

• macOS

For Linux:

• Linux

All platforms - Plastic: Corrected Merge View title when applying shelveset

All platforms - Plastic: When applying a shelveset the view title is now "Apply shelveset sh:<shelveset id>".

Windows - Gluon: Legacy merge tool opening for shelveset conflicts

• Windows

Windows - Gluon: On Windows Gluon, when trying to apply a shelveset that is in conflict with the local changes, we were opening the legacy merge tool (native to Windows). We fixed this issue, and now the new cross-platform merge tool is used instead

• Windows