Merging Two Projects into one
Early in June, my co-developer and I had the same base project that is archived in SVN, but starting developing separate TestComplete 8.7 tests of our application functionality. After a month we are ...
Forum Discussion
A little more history. When we had a common SVN base early last month, it was quite painful to get there. At the time, we were not aware of the Name Mapping merge, but that is only within the same project suite anyway.
SmartBear has basically responded through a Support Ticket response that we do not support project suite merge. It has to be done manually, but they provide no process sugestion of how to go about the merge, or even which files need to be merged. The script files themselves are the easy part; when I asked about prject suite, project, NameMapping, Objects, and Stores, the response from Support was "You cannot merge these files directly - neither from TestComplete, nor using an external tool. These are the files that correspond to the Project and Project Suite nodes in the Project Explorer. They store the information about the project elements, Test Items, project and project suite settings - nothing from this list can be merged".
It seems to me that using ANY source control application presents these same issues, for scripts (supported very well) have associated data files (mentioned above) that are NOT supported well. So if test developer A and B start with the same project base, A records new script X and B reconds new script Y, don't they have the same issue at the end of the day? That is, the scripts are OK, but issues and conflicts occur in the associated data files that still must be manually resolved.
How do other companies and their users develop in a common environment and still manage to use a source control system?
SmartBear has basically responded through a Support Ticket response that we do not support project suite merge. It has to be done manually, but they provide no process sugestion of how to go about the merge, or even which files need to be merged. The script files themselves are the easy part; when I asked about prject suite, project, NameMapping, Objects, and Stores, the response from Support was "You cannot merge these files directly - neither from TestComplete, nor using an external tool. These are the files that correspond to the Project and Project Suite nodes in the Project Explorer. They store the information about the project elements, Test Items, project and project suite settings - nothing from this list can be merged".
It seems to me that using ANY source control application presents these same issues, for scripts (supported very well) have associated data files (mentioned above) that are NOT supported well. So if test developer A and B start with the same project base, A records new script X and B reconds new script Y, don't they have the same issue at the end of the day? That is, the scripts are OK, but issues and conflicts occur in the associated data files that still must be manually resolved.
How do other companies and their users develop in a common environment and still manage to use a source control system?
