Having Trouble with tc-projects under source control

Hi Carsten,





The current architecture of TestComplete project files does not assume they can be merged by third-party merging software. An expected way to work with TestComplete projects added to an SCC system is to lock a file if it is checked out by a user.

Hello David,



thank You for Your answer. Until now we have followed Your advice and never at one time more than one developer worked

on the tc-project.



However, I find it hard to believe that there is no way to allow several users to work on one project at the same time?!



What if the whole project is subdevided into various parts? Say for each user a seperate testproject in one solution?



Would You be able to supply a detailed description of how to achieve what we desire?



best regards



Carsten

Hello Carsten,





In this case, each developer should work over his/her tests without touching any other tests. If the current work requires making modifications to project settings of other project files, these files should be checked out, modified, and then, checked in right after this.





Please let me know if you face any specific problems working with TestComplete and its SCC integration feature.

Hello David,



thanx for Your quick reply.



We will try it out, and I´ll get back to You with what we have experienced.



Carsten

Hello
David,



we have been trying.

We are using Subversion and TortoiseSVN as source-control, this is not
integrated in TC. We are using TC with several Named User licenses.

Every user
has his TC-project-Version on his own computer. The problem starts,
when a user
tries to update his version.





Here a short description of how we tried to avoid conflicts:

Developer1 (D1) opens TC-Project (tcp) and adds a keywordtest, checks
in. Developer2
(D2) opens same tcp and updates. No problem. D2 adds keywordtest and
checks in.
D1 updates -> no problem.

D1 changes his test, D2 changes his test. D1 checks in, D2 wants to
checks in.
Now D2 wants to update his version and gets conflicts!!



The conflicted file is the tcCfgExtender. We are not able to relate the
changes
in that file to what has been changed in the individual tests.

When D2 now
resolve the conflict by Choosing the Option “Taking theirs”, D2 has no
problems
to continue his work on his updated version.

Is it possible
to take this file out of source-control or will that raise problems for
using
TC?

Please give
us some advice.



greetings



Carsten

Hi Carsten,



Have a look at this thread: http://www.automatedqa.com/newsgroups/d.cgi?cmd=xover&group=automatedqa.public.testcomplete&related=40868&utag=

With proper settings in .cvsignore file it might help...

Hi Alexei,



thanx for the answer.



The most important issue in that thread seems to be which files to svnignore. Using TC Version 7.52 uses partially different file-extensions and I can`t say if the discussion on that old thread is related to keywordtests also.



Here they say and I quote:

>I keep tcLS outfor both the MDS and the PJS.  Those are local
> settings.
>
> The only things we source control are
>
> PJS
> MDS
> tcScript
> tcAX
> tcODT
> tcFiles
> tcObject
> tcRegions
> tcStores
> tcASs
> tcNet* (that's all the network suite files)
> tcLLC (for low level recording collections)
> tcLT* (all the load testing files)
> and, of course, the code units.  In our case, these are SD files for
> the DelphiScript code units.

What filetypes do You suggest we should have under source-control. Usually we have a combination of keyword and script-tests.



best regards



Carsten

Hi Carsten,

We are using Subversion and TortoiseSVN as source-control, this is not integrated in TC.

You need to install a special SCC API provider for Subversion to make TestComplete able to work with this SCC system. A couple of commercial providers can be found on the Internet.

The conflicted file is the tcCfgExtender.

The list of files that should not be added to a SCC base can be found in the List of Files Added to Source Code Control help topic.

Hi guys,



Please tell me a way to merge two stores(for CheckPoints) which are created from separate machines..



Thanks..

Hi Shanmugavel,



As David said in the first posts of this thread, all configuration files from TC project cannot be merged easily and reliably. That is why the recommended way for TestComplete is to organize the work in such a way that there is no need to work on the project concurrently.



In your case you can create a screenshot of the objects from the Stores for the project opened on the second machine, copy all needed objects to the first machine, close the project on the second machine and open it on the first machine and add the missed objects. After that delete the project from the second machine and use only project from the first machine (open it using network path if needed to open it from the second machine).