Release Notes

mergebots can now merge conflicts across files. A release note won't probably tell how awesome it is, but let's try :-)

* You move a method to a different file and change it.

* Meanwhile someone else modifies the method in the original location in a different branch.

* Now the mergebot merges the first branch, no problem.

* Then it goes and merges the second one: and it applies the changes made by your colleague to the method you moved. Automatically. No conflict needed if the changes do not collide.

Sufficiently advanced technology is indistinguishable from magic, and this, indeed, is magic ;-)

Can't say how proud we are for this.

Enjoy

macOS/linux GUI: Diff viewer: When clicking a line involving a difference, the diff navigation counter is updated. This allows navigating differences by clicking in the diff's textboxes, and not only using the navigation buttons (first, previous, next, last).

Windows GUI: Branch Explorer: we refactored the rendering code to greatly reduce memory usage. Now it should use 1/3 of the memory it used before. Our entire history with 11k branches since 2006 went down from 900MB to about 300. And this is just a first step :)

DevOps: Our jenkins mergebot plugin now supports Lightweight checkout for pipelines! Give it a try!

Windows GUI: "Diff with other changeset" dialog did not save/load the default query properly. Now it's fixed.

Windows installer: The installer failed to setup the Visual Studio package for Visual Studio 2017 if there was a running instance in the machine. Now the installer forces to close all instances before installing the package.

devops: We changed the date format in the .control.log log files so now dates are printed in the same format used by the other logs we produce. This is used each time a plug and mergebot is started.