Forum Discussion

krkarthik_info's avatar
krkarthik_info
Frequent Contributor
12 years ago

Can TC allow multiple user to work on the project which is stored in SVN repository in server using Source Control (SCC) feature in TC?

Hi,



I have added a project suite into SVN repository which is in server using File -> Source Control -> Add Project Suite option and it got added into the repository successfully.



My project suite contains two script file (Ex: Unit1, Unit2) along with default folders and files and I have Checked in the files (Unit1, Unit2) into the repository.



My Queries:

1. Once I checked in any file (Unit1, Unit2) into the repository, I cannot modify it until I Check Out that file from the repository using Source Control -> Check Out. Is this how it works? (My understanding about source code control is Check out the files from SVN repository only when there is change in the file in the repository and it will be placed into Working Copy folder in local machine. And Check in the file into the repository when we change or do any modification in the file in the Working Copy folder in local machine)



2. Another user of my team tried to get the same project suite file which is in SVN repository using File -> Source Control -> Open from Source Control... in TC and he was able to get the project suite files into his project explorer. But when he tried to add the file (Lets Say Unit3 in Script) into the suite, he was not able to add the file instead he was getting an error. I want my team member to add the file (Unit3) and check in his changes into repository and I would like to check out the same file (Unit3) which was added by my team member into my project suite using source control. Kindly suggest on how to do this.



I tried searching or exploring smartbear site, but I couldn't get any solutions to my query.



Kindly suggest on this.



Thanks in advance.

2 Replies

  • hlalumiere's avatar
    hlalumiere
    Regular Contributor
    12 years ago
    SVN is a repository, but you do not work directly on the data within it.



    First, you should branch the files you are working on. The action of branching tells the SVN repo that the original version of the files should be copied locally and disconnected from the repo, as a brand new version of those files. This is critical when you have multiple users working on the same repo, to avoid conflicts and problems in general.



    Then you can do your work and modifications on your local copy.



    Once you are done, you can commit your branch, have it reviewed, tested, and in the end merged back into the main trunk. If some other mod was done to the same files you committed while your mods were being reviewed, you will encounter a conflict. At that point you need to manually review the mods of each versions, and decide what to keep from each.



    Think of your SVN repo like a snapshots collection. It is NOT a file-sharing server.
  • Marsha_R's avatar
    Marsha_R
    Icon for Champion Level 3 rankChampion Level 3
    12 years ago
    What error did you see when the second user tried to add the file?