Udostępnij za pośrednictwem


Merging

You must now merge the customized objects into the new standard database to create the new custom database.

For this step, you should use a merge tool which lets you see all three existing versions at the same time and merge the changes into the fourth, new custom version.

Old base version Old custom version New base version New custom version

Standard Microsoft Dynamics NAV 2009 objects

Customized Microsoft Dynamics NAV 2009 objects

Standard Microsoft Dynamics NAV 2013 R2 objects

Result of merging

Typically, you merge changes in the old custom version into the new base version. However in some cases, when the number of changes in the new base version is insignificant, it can be easier and faster to merge those changes directly into the old custom version and then copy merged objects into the new custom version.

The following table highlights the key code merging principles. We recommend using these principles for the merging process, depending on how a certain line or block of code that exists in the old base version is changed throughout the versions.

Old base version Old custom version New base version New custom version Comments

Exist

Not modified

Deleted

Delete

Exist

Not modified

Modified

Copy from new base version

Exist

Not modified

Not modified

Copy from new base version

Exist

Modified

Deleted

Conflict

Exist

Modified

Modified

Conflict or copy from new base version

There is no conflict if the old custom version is modified just like the new base version.

Exist

Modified

Not modified

Copy from old custom version

Exist

Deleted

Deleted

Delete

Exist

Deleted

Not modified

Delete

Exist

Deleted

Modified

Conflict

Inserted

Copy from old custom version

Inserted

Copy from new base version

Inserted

Inserted

Conflict or copy from new base version

There is a conflict if the inserted code is different in the old custom and in the new base versions.

After you have completed the merge, export the new custom version to a text file, import it into the new Microsoft Dynamics NAV 2013 R2 database, and then compile all objects. You can expect compilation errors. You must resolve the errors before you can continue.

You now have a new customized database. This database contains all the objects that have been customized to include the changes that were made in the old database.

Important

Client Extensibility add-ins built for Microsoft Dynamics NAV 2009 must be recompiled to use the Microsoft.Dynamics.Framework.UI.Extensibility.dll that were included with Microsoft Dynamics NAV 2013 R2, before they can be run in Microsoft Dynamics NAV 2013 R2.

See Also

Concepts

Upgrading to Microsoft Dynamics NAV 2013