In ODI 12c Configured with SVN, Conflicts Are Found when Performing "Restore With Merge" But Resulting in "no difference found" After ODI Object Is Renamed (Doc ID 2414519.1)

Last updated on JULY 30, 2024

Applies to:

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".

Cause