 |
This topic describes functionality of the SCC API Providers plugin, which is obsolete and is left for backward compatibility only. To learn about supported source control integrations, see Integration With Source Control Systems. |
TestComplete source control services let you add your project, project suite and project item files to a source control system directly from TestComplete. After you bind your project suite to a source control system, you can easily use TestComplete as a client for this control system. In other words, TestComplete includes various features that let you work with the source control database directly from the TestComplete IDE. This approach simplifies creating and modifying tests that are bound to a source control system as you do not need to switch between TestComplete and the source control client every time you change the project or any of its elements.
However, it is a typical situation when several testers work on the same project simultaneously. In this case, the testers will have to merge all the changes so that the source control system contains a project version with all the modifications. You can merge files of the desired project in three ways. The sections below describe them in detail.
Merging Files Using TestComplete
Merging Files Using the Source Control Client or Outside Applications
Merging Files Using TestComplete
TestComplete only helps you in merging Name Mapping files. It allows you to import data of external Name Mapping files to Name Mapping of the currently opened test project so that the mapped objects and aliases defined in external files become available to tests in the current project.
To merge an external Name Mapping file, you can use the Merge with context menu item of the Name Mapping project node. For more information, see Merge Name Mapping Files.
Merging Files Using the Source Control Client or Outside Applications
Each source control system provides special features for merging files stored in it. Also, currently there are lots of special tools that are used to merge several sets of changes made in one file by different users. For instance, you can use WinMerge or similar tools. However, we recommend that you use it only for merging script files as these files contain plain text and merging tools can analyze this text easily. We do not recommend using special software to merge files other than scripts.
If you need to merge a structured file, for instance, project or keyword test files, we recommend that you do that manually (for more information on this approach, see the section below).
Merging Files Manually
If none of the approaches described above helps, you can merge the desired changes manually. Note that the structure of most of the files is important for TestComplete. So, when you are merging two versions of one file, make sure the resulted file has the required structure. Otherwise, TestComplete may have problems with opening the merged file.
See Also
Integration With Source Control Systems via SCC API Providers (Legacy)
Binding Test Projects to Source Control (Legacy)
Changing Source Control System or File Location in It (Legacy)
Unbinding Projects and Project Suites From Source Code Control (Legacy)
Working With Source Control Systems via SCC API Providers - Overview
List of Files Added to Source Code Control
Resolve Conflict Dialog