Release Notes

Windows - Plastic: An unexpected error was thrown when the mergetool is configured without the progress command line option and semanticmerge is launched to solve the merge. Now it is fixed.

Server merge multifile: Fix the following failing scenario:

* You move a method to a different file.

* Meanwhile someone else modifies the method in the original location in a different branch and also modifies other method in the other file, where the method was moved.

In this case, the merge was automatic but the change done in the moved method was lost. Now it's fixed.

Remember, this feature is used by the mergebots. They can merge conflicts across files!

Windows - Plastic: We had some GUI components too narrow for the Spanish translation of the Windows GUI. The detected aesthetic issues are now fixed - don't hesitate to contact us if you see something out of place!

All platforms - GUI and command line. Fixed an issue trying to merge moved paths that were already in use in the workspace.

When merge failed to apply a move because the path was in use, it updated the metadata but not the filesystem, creating an inconsistency.

Now the merge doesn't apply the move to the metadata if it can't be done on disk.

Now you can also continue the merge if you release the path that was in use and click on "process all merges" again. You no longer need to undo all the changes and restart the merge after releasing the path.

All platforms - WebUI: We fixed the "File explorer" navigation link in the top bar. It was always redirecting to the tree of br:/main, but users that renamed their main branch to something else were getting Not Found results.

All platforms - Command line client, Plastic: Imagine the following scenario - you are working in a changeset, and somebody else deletes it! Apart from your colleague being a little disrespectful towards you and your work, Plastic warned you in the Pending Changes view that there were new changesets in the repository, which is not true… if any, there are only older changesets for your branch!

Now, Plastic won't show that misleading message. Instead, it will warn you that the changeset you are working on was deleted when you try to checkin your changes.

All platforms - Plastic: The undo operation left checked-out xlinks pending -you needed to undo them again- sometimes when trying to undo all changes. This happened if the checked-out xlink was part of the targeted changes and under it there was a moved item with dependencies (e.g. a moved directory whose source is in use by a copied directory). Now all changes are undone the first time, as expected.