User Guide Getting started Working with TestArchitect Client Advanced features of TestArchitect Client Diff tool Using Diff Tool for folder comparisons

 Merging differences between folders with the Diff Tool

Merging differences between folders with the Diff Tool

The Diff Tool enables you to synchronize the contents of two folder hierarchies by copying items and folders between them.

To merge differences from one panel to the other (either source to target, or target to source), do the following:

1. Invoke the Diff Tool dialog box. (Learn more.)
   
   

2. To copy items and folders from one folder hierarchy into the other, first select those items and/or folders to be copied.

   Important:
   If you suspect that a folder or project item might have changed, it is highly recommended that you run Refresh before performing any merge operation. Click Refresh () on the toolbar, or press F5.

3. The merge function can be applied in several ways:

   • Copy Right: Copies the currently selected items from Source hierarchy (left panel) to the Target hierarchy (right panel). Those corresponding items that already exist in the Target are replaced.

     Note:
     • button, or
     • Copy Selected > Copy from Source to Panel from the toolbar, or
     • Copy Selected from Source to Target Panel from the context menu.

   • Copy Left: Copies the current project item from Target hierarchy (right) to Source hierarchy (left). Those corresponding items that already exist in the Source are replaced.

     Note:
     • button, or
     • Copy Selected > Copy from Target to Source from the toolbar, or
     • Copy Selected from Target to Source Panel from the context menu.

   • All Right: Copies all difference items from Source hierarchy (left) to Target hierarchy (right). Use this to synchronize two folders with one single merge command.

     Note:

     1. Right-click the Tests, Data, Interfaces, or Actions node, or a folder, and then select Copy Selected from Source to Target Panel.

     2. The Merge Option dialog box appears with two options:

        • Paste and keep those items: (Default) Replaces the items in the Target (right panel) with the items in the Source (left panel), and preserves all items that do not exist in the Source.
        • Paste and delete those items: Replaces the items in the Target with the items in the Source, and deletes from the Target hierarchy all items that do not exist in the Source.
          
          

   • All Left: Copies all differences from Target hierarchy (right) to Source hierarchy (left). Use to synchronize two folders with one single merge command.

     Note:

     1. Right-click the Tests, Data, Interfaces, or Actions node, or a folder, and then select Copy Selected from Target to Source Panel.

     2. The Merge Option dialog box appears with two options:

        • Paste and keep those items: (Default) Replaces the items in the Source (left panel) with the items in the Target (right panel), and preserves all items that do not exist in the Target.
        • Paste and delete those items: Replaces the items in the Source with the items in the Target, and deletes from the Source hierarchy all items that do not exist in the right panel.
          
          

   The merged nodes are indicated with an icon containing a small green arrow adornment ( and ).

   Tip:
   If the result of a merge operation is not what you expected, click Undo on the toolbar, or Ctrl + Z, to reverse the operation. Then rescan the files and try merging again.

4. Click Save on the toolbar.

   Fastpath: Ctrl + S.

   Note:
   At this point, you will be given one last chance to decide which of the items targeted for merging will actually be written to disk.

   A confirmation dialog box appears displaying which items will be copied and where they will go. The Name column lists all the selected items. The To Location column shows you where those items will be copied to.
   
   

5. Select the items to be copied, and then click OK.

   The status of Done indicates that the merging is successful.
   
   

   Important:

   • When you merge to add more test modules, if the allowed number of tests modules is exceeded under your specific TestArchitect license, you will receive the following message:

     The allowed number of created test modules in the “<repositoryName>” repository has been reached under your license. However, you are still able to run automated tests with TestArchitect. To resolve this issue, please contact TestArchitect Support at [email protected] to upgrade your TestArchitect license to a higher tier.

   • Similarly, when you merge to add more test cases, if the allowed number of tests cases is exceeded under your specific TestArchitect license, you will receive the following message:

     The allowed number of created test cases in the “<repositoryName>” repository has been reached under your license. However, you are still able to run automated tests with TestArchitect. To resolve this issue, please contact TestArchitect Support at [email protected] to upgrade your TestArchitect license to a higher tier.

6. Click Close to dismiss the confirmation dialog box.