Forum Discussion

aldebaran's avatar
aldebaran
Occasional Contributor
15 years ago

Having Trouble with tc-projects under source control

Hi all,



we are having troubles with tc-projects under source control, using subversion and tortoise. So far we´ve used a workaround

using a locking system so only one person at a time was able to alter the tc-project.



The reason for this workaround was that we found it impossible to manually merge some of the tc-files. Unfortunately it is almost impossible not getting conflicted files if more than one person works on a tc-project.



This is not satisfactory for us. There surely must be a proper way of doing this and ending up with lesser conflicts.



greets and thanx for any ideas.



Carsten

13 Replies

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



    Do you mean that testers should not work in the same test item in a project (script, keyword script), but using a shared project is fine?

  • Hi Russell,





    Yes, using a shared project is fine while two testers do not edit the same script or keyword test at a moment. When one of them changes a project item and saves it, the item is automatically updated for the second tester. If the second tester has this project item's editor opened at that moment, TestComplete notifies that the element has been changed and asks whether it should be reloaded.
  • aldebaran's avatar
    aldebaran
    Occasional Contributor
    Hi Russell,



    following David´s advice and setting svn.ignore to the files not listed in the List of Files Added to Source Code Control , we rarely have to try and resolve conflicts manually. Communication between test-team-members has to be internsive though. If person A needs to add a new keyword-test or script, an update is needed as usual, but all other team members must have committed their changes if they included adding of tests.



    greets



    c