Release Notes

Server - macOS, Linux, Windows: We enabled multi-file semantic merge by default in mergebots. Check http://blog.plasticscm.com/2019/07/merge-moved-code-across-files.html for more info.

Windows - Plastic: The new Code Review system now allows to visualize comments that are located in revisions that are not loaded by the diff window. This happens when, for example, you applied revision comments, and created new revisions for a file in the branch. When this happens, we display a panel with three actions:

* Diff revision with comments: This action allows to visualize the revision with the comment on the right diff pane, and the base revision on the left diff pane.

* Last in branch: This action displays the last revision in branch on the right diff pane, and the base revision on the left diff pane (the same as when you select a file in the top tree).

* Diff with head: This action the revision with the comment revision on the left diff pane, and the last revision in branch on the right diff pane.

Remember, right now, you need to start with plastic --codereview to enjoy the new feature.

Windows - Plastic: The new Code Review system now allows to visualize change `sts in the comments list.

Remember, right now, you need to start with plastic --codereview to enjoy the new feature.

Windows - Plastic: The new Code Review system now allows to choose the comment type when adding a new comment. You can 'request a change', 'ask a question' or simple write a regular comment.

Also we added the possibility of discarding requested changes.

Remember, right now, you need to start with plastic --codereview to enjoy the new feature.

Server - DevOps: Our built-in mergebot that implements trunk-based-development cycle (a.k.a. trunk-bot) is now able to use embedded Plastic code reviews to drive the CI/CD lifecycle.

Enable the following "Process reviewed branches only" toggle button in trunk-bot configuration to activate this feature:

The feature works as follows:

* When a code review of a tracked branch (those that starts with the configured branch prefix in trunk-bot config) is created, or its status changes, the task branch is queued in trunk-bot.

* Then, trunk-bot will eventually dequeue this task branch. But before continue its processing in the CI cycle, trunk-bot will check whether there is at least an "Approved" code review for this branch. Otherwise, the branch processing is skipped but enqueued.

* If there are more than a code review linked to this task branch, all of them need to be approved before processing the task branch.

* If all the code reviews are approved, the task branch continues its processing by the trunk-bot:

* a)If the merge fails (manual conflicts detected), or the branch build in the configured CI system fails, the status of the linked code reviews of the branch will be set to "Pending".

* b)If the merge succeeds and the branch build succeeds too, the task branch is merged, and the "status" attribute of the branch is set to "merged" (these fields must be filled in the trunk-bot configuration).

You can use this "Process reviewed branches only" alone to drive the CI/CD cycle, or use the legacy "branch status" based lifecycle to drive the process, or combine them: before trying to merge a task branch into trunk, both the status of the branch must be set to "resolved" value, and all the code reviews must be set to "Approved".