Release Notes

Public

Release 7.0.16.2077

Mar 26 2018
New

New feature in preview: server-side merge (or "merge-to" with conflict resolution, if you prefer).

To enable it: add this in your client.conf:


<ServerSideMergeEnabled>yes</ServerSideMergeEnabled>

If you have been using Plastic for a while, chances are you are familiar with the "merge-to" feature. It lets you do "workspace less" merges. Like, you don't even have a workspace, but you can merge "main/task127" into "main".

But, merge-to had a big restriction: it only worked if there were no manual conflicts. As soon as a file had a conflict (even a simple one that could be fully automated), or a directory was in conflict, merge-to stopped.

Now this changed, and all type of conflicts, including file merges, can be resolved in merge-to.

The motivation behind the change? We are all moving towards more automated workflows where every single branch is tested before being merged. So, under that way of thinking, testing in your workspace first is not always necessary. We changed our minds here because, for years, we thought it was good to build and test your code locally prior to checkin the result of the merge, but DevOps and automation are changing all that, so now we feel confident of this merge-to with conflict resolution approach.

The feature is in preview at this point because is just out from the oven, but it will be enabled by default soon.

New

Linux GUI (Gtk): Now, you can create new attributes directly from the GUI. To do so, click on the "Apply attributes" button on the right of the Branch Explorer, and click on the "Create" button next to the attribute list.

Internal and public releases

The Plastic SCM development team works in short iterations delivering frequent releases.Our goal is to have at least one new release every week, with new functionalities, bug fixes and performance tweaks.

Every 'weekly' release is not published to our customers, but we like to detail each of them in the release notes so users can easily follow what we achieved on every short iteration.

The releases marked with the word "public" are the ones we do publish on the website. The ones marked as "internal" are the releases we create in-house to keep the project moving week after week.

Version numbering

Starting in Plastic SCM 4.0 the version numbering schema has been modified:

  • major.minor.compatibility.buildnumber

  • Sample: 5.0.44.511 means:
    • 5 -> major release number
    • 0 -> minor release number
    • 44 -> compatibility -> all clients and servers with "44" in the compat number are compatible, even if the build number changes
    • 511 -> internal build number