Release Notes / Release

Configuration changes, for example your choice of external diff and merge tool, didn't take effect until SemanticMerge was re-launched. We have fixed this – now your changes take effect immediately, which is much less confusing.

A 'Value cannot be null. Parameter name: source' exception was thrown when the destination file of the merge was empty. Fixed.

Improved declaration matching mechanism to properly detect the conditional inclusion in the following scenario:

Src

ifndef MY_VAR
include "MyInclude1"
include "MyInclude2"
int my_field1;
int my_field2;
endif

Dst

ifndef MY_VAR
include "MyInclude1"
endif

Wrong Result

include "MyInclude1" (Moved)

Result

include "MyInclude2" (Deleted)
int my_field1; (Deleted)
int my_field2; (Deleted)

The semantic outline didn't respect the "Ignore whitespace changes" setting for those languages other than CSharp and VB. So, a declaration appeared as changed in the semantic outline although it only had whitespace changes. Now it's fixed for all languages.

Under some circumstances, the source changes were wrongly positioned in the result file. Fixed.

Base

namespace NewNamespace
using System;
using System.Net;

Src

using System;
using System.IO; (Added)
using System.Net;

Dst

namespace NewNamespace
using System;
using System.Net;

Wrong Result

namespace NewNamespace (Deleted)
using System;
using System.Net;
using System.IO; (Added)

Result

namespace NewNamespace (Deleted)
using System;
using System.IO; (Added)
using System.Net;

Launcher: A 'Value cannot be null. Parameter name: path' exception was thrown when you saved the result file. Fixed.

Launcher: SemanticMerge was kept open when the merge was solved using the default text-based tool (xmerge). Fixed.

Changes to fonts weren't properly stored to disk. As a result, font preferences were reset on startup. Now it's fixed.

Some dialogs (such as license, about, configuration, etc … ) were cut off in some screen configurations and resolutions. Now it's fixed.

While solving changed-changed problems using the Mergetool, the "Save base / source / destination contributor & exit" options were not working properly. Now it's fixed.

Under some circumstances, a 'Value cannot be null' exception was thrown when trying to calculate renames differences for multi-file merge. This is now fixed.