In ODI 12c Configured with SVN, Conflicts are Found When Performing "Restore With Merge" But Resulting in "no Difference Found"

(Doc ID 2414519.1)

Last updated on JULY 03, 2018

Applies to:

Oracle Data Integrator - Version 12.1.2.0.0 and later
Information in this document applies to any platform.

Symptoms

An Oracle Data Integrator (ODI) 12c Work Repository has been configured for versioning with Apache Subversion (SVN).

When restoring a versioned artifact and selecting "restore with merge", and a conflict is found, in some cases the dialog that follows doesn't allow for further actions and reports "no difference found".

ODI should simply restore the object if there is no "merge" to perform.

To reproduce:

  1. Login to the versioned ODI Master / Work Repository.
       
  2. Create a Mapping, ie: test_orig.
      
  3. Perform initial versioning:
    Right-click on mapping, select "Version", "Add to VCS..."
       
  4. Modify the name, ie: test_mod
        
  5. Right-click on the Mapping, select "Version", "Create VCS Version"
    Notice that there are two new versions of "test_mod"
        
  6. Restore the Mapping:
    Right-click on mapping, select "Restore", select the original version where mapping name is "test_orig"
        
  7. Right-click on the Mapping, select "Version", "Create VCS Version"
        
  8. Right-click on Mapping, select "Restore", make sure that "Restore with Merge" is checked, and select the version where mapping name is "test_mod"
    Select the version that has action "Renamed/Copied/Moved"

    The "Compare Results" dialog appears, and select the icon to "Perform Merge"
    => no difference found

    The issue does not occur when selecting the second version that has the action "Modified".

Note the same issue can be reproduced when attempting to restore from a tag.

For simplicity, we used the "right-click" of the version object in Designer.

Changes

 

Cause

Sign In with your My Oracle Support account

Don't have a My Oracle Support account? Click to get started

My Oracle Support provides customers with access to over a
Million Knowledge Articles and hundreds of Community platforms