Public

Release 2.0.122.0

Apr 09 2018
New

A warning dialog will be shown on startup when one or more files cannot be parsed. This way we allow users to run the associated text-based tool.

Remark: There is a "--nostructurewarn" flag to skip showing this dialog and directly launch the tool. That option can be also applied as a persistent setting in the configuration window -> "general" tab.

Bug

The differences were not correctly calculated when an option related to the file content was changed (e.g. reformat source code, encoding). Fixed.

Public

Release 2.0.120.0

Mar 05 2018
New

Disabled the C# language error highlighting feature of the textbox -developed by ActiPro- until it supports C#6/7. This will help avoid the confusions reported by users. We're in contact with the ActiPro guys to get it available as soon as possible.

Bug

A "No external merge tool has been specified in order to proceed with the merge" warning was shown when the merge was solved using the text-based tool. Fixed.

Bug

The automatic installation of semanticmerge for PlasticSCM version control was not working correctly. So, even if PlasticSCM was correctly configured, the tool said it was not. Fixed.

Public

Release 2.0.118.0

Jan 29 2018
New

SemanticMerge for Windows now supports C# 7!

Public

Release 2.0.116.0

Dec 21 2017
New

The JVM-based parsers (Java, C, C++) -as well as the external one- will now display more accurate error messages if an error is detected. Please have in mind that our bundled JVM-based parsers require JVM version 8 or higher!

Bug

SemanticSCM: An "Index was outside the bounds of the array" exception was thrown, caused by a problem in how the semantic differences were concurrently calculated. Fixed.

Bug

An exception with the message "specified argument was out of the range of valid values" appeared sometimes if the user switched quickly between file diffs. Fixed.

Bug

Semantic merge: A null exception was thrown sometimes trying to set the syntax language in the result textbox. Fixed.

Bug

A "Path cannot be null" exception was thrown when running a semantic merge that involved 3 text files and the "run the text merge tool" button was clicked. Fixed.

Bug

Semantic diff C#: some outline nodes (e.g. C# properties or regions) were not expanded even if they had differences. It was very uncomfortable. The user had to expand them manually in order to see the differences. Fixed.

Bug

A null exception was thrown when a changed-changed conflict was pending to solve and the result declaration was not present. Fixed.

Public

Release 2.0.107.0

May 17 2017
New

The semantic diffs navigation has been improved. Clicking on a method (or any other declaration) in the 'semantic outline' panel will automatically focus its first difference.

Also, the highlighting of the selected semantic difference has been improved, making clearer which word/lines have changed indeed.

New

The 'Parsing errors found' dialog is no longer shown at startup. If SemanticMerge detects parsing errors, a warning panel will be shown at the top of the tool. It will include a button to show a dialog detailing the errors that were found.

New

A new --nostructurewarn CLI argument was added to skip the structure errors dialog on startup and directly launch the associated text-based tool. This can be also applied as a persistent setting in the configuration window, "general" tab.

Bug

The delete/add of C++ 'include' statements was interpreted as a move/rename. Fixed.

Bug

The 2-way merge button was not launching the configured external tool. Fixed.

Bug

Typing paths enclosed within quotation marks in any of the textboxes of the "external tools" preferences tab caused the "ok" button to do nothing on click. Now, these quotation marks will be stripped when the "ok" button is clicked and the form validation will continue as expected.

Bug

Typos on the help text have been corrected. A description of what a "declaration" actually is has been added.

Bug

The C++ 'include' statement texts were being drawn outside its visual diff/merge containers. The text size has been reduced in that view, too.

Bug

The contributor contents (source, base, destination) weren't updated after a "recalculate merge" operation. Fixed.